Merge branch 'master' into develop

bower.json

@@ -2,6 +2,7 @@
   "name": "bootstrap-switch",
   "description": "Turn checkboxes and radio buttons into toggle switches.",
   "version": "3.3.2",
+  "license": "Apache-2.0",
   "main": [
     "./dist/js/bootstrap-switch.js",
     "./dist/css/bootstrap3/bootstrap-switch.css"

package.json

@@ -34,7 +34,7 @@
     "url": "git://github.com/nostalgiaz/bootstrap-switch.git"
   },
   "bugs": "https://github.com/nostalgiaz/bootstrap-switch/issues",
-  "license": "Apache Version 2",
+  "license": "Apache-2.0",
   "readmeFilename": "README.md",
   "devDependencies": {
     "browser-sync": "^2.6.4",
@@ -71,8 +71,8 @@
       "basePath": "/dist/",
       "files": [
         "*.js",
-        "bootstrap3/*.css",
-        "bootstrap2/*.css"
+        "css/bootstrap3/*.css",
+        "css/bootstrap2/*.css"
       ]
     }
   ]