Merge branch 'develop'

# Conflicts:
#	bower.json
#	component/component.js
#	component/maps/component.js.map
#	package.json

Author: pkempenaers

CHANGELOG.md

@@ -1,5 +1,11 @@
 Version numbers correspond to `bower.json` version
 
+# 2.0.0-beta.7
+
+## Breaking Changes
+- bower.json and package.json main are back to the original dist/angularjs-dropdown-multiselect.min.js
+- Linking directly to the repository was bad practice and is no longer suported
+
 # 2.0.0-beta.5 & 2.0.0-beta.6
 
 ## Features

README.md

@@ -19,7 +19,7 @@ This directive gives you a Bootstrap Dropdown with the power of AngularJS direct
 http://dotansimha.github.io/angularjs-dropdown-multiselect/
 
 ## Dependencies
-- required: AngularJS >= 1.2, Bootstrap >= 3.0
+- required: AngularJS >= 1.5, Bootstrap >= 3.0
 
 - Make sure to add the dependencies before the directive's js file. 
 - Note: Bootstrap JS file is not needed for the directive, it just uses the CSS file

bower.json

@@ -1,50 +1,50 @@
 {
-  "name": "angularjs-dropdown-multiselect",
-  "version": "2.0.0-beta.6",
-  "authors": [
-    "Dotan Simha <dotansimha@gmail.com>",
-    "Pieter Kempenaers <pkempenaers@myforce.be>"
-  ],
-  "description": "AngularJS Dropdown Multiselect directive",
-  "keywords": [
-    "angular",
-    "angularjs",
-    "directive",
-    "dropdown",
-    "multiselect",
-    "checklist",
-    "list",
-    "bootstrap",
-    "checkbox"
-  ],
-  "license": "MIT",
-  "main": "component/component.js",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {
-    "angular": "~1.5"
-  },
-  "devDependencies": {
-    "angular-highlightjs": "^0.7.1",
-    "bootstrap-sass": "~3.3.5",
-    "angular-mocks": "~1.5.3",
-    "angular-bootstrap": "~2.1.4",
-    "angular-ui-router": "~0.4.2"
-  },
-  "resolutions": {
-    "angular": ">=1.4.0"
-  },
-  "overrides": {
-    "bootstrap-sass": {
-      "main": [
-        "assets/stylesheets/_bootstrap.scss",
-        "assets/fonts/**/*"
-      ]
-    }
-  }
+	"name": "angularjs-dropdown-multiselect",
+	"version": "2.0.0-beta.6",
+	"authors": [
+		"Dotan Simha <dotansimha@gmail.com>",
+		"Pieter Kempenaers <pkempenaers@myforce.be>"
+	],
+	"description": "AngularJS Dropdown Multiselect directive",
+	"keywords": [
+		"angular",
+		"angularjs",
+		"directive",
+		"dropdown",
+		"multiselect",
+		"checklist",
+		"list",
+		"bootstrap",
+		"checkbox"
+	],
+	"license": "MIT",
+	"main": "dist/angularjs-dropdown-multiselect.min.js",
+	"ignore": [
+		"**/.*",
+		"node_modules",
+		"bower_components",
+		"test",
+		"tests"
+	],
+	"dependencies": {
+		"angular": "~1.5"
+	},
+	"devDependencies": {
+		"angular-highlightjs": "^0.7.1",
+		"bootstrap-sass": "~3.3.5",
+		"angular-mocks": "~1.5.3",
+		"angular-bootstrap": "~2.1.4",
+		"angular-ui-router": "~0.4.2"
+	},
+	"resolutions": {
+		"angular": ">=1.4.0"
+	},
+	"overrides": {
+		"bootstrap-sass": {
+			"main": [
+				"assets/stylesheets/_bootstrap.scss",
+				"assets/fonts/**/*"
+			]
+		}
+	}
 }