Merge branch 'master' into development

Author: bjorn2404

bower.json

@@ -15,6 +15,10 @@
     "jquery": ">=1.7",
     "handlebars": ">=1.0"
   },
+  "main" : [
+    "dist/assets/js/plugins/storeLocator/jquery.storelocator.min.js",
+    "dist/assets/css/storelocator.min.css"
+  ],
   "devDependencies": {
     "grunt-contrib-jshint": "~0.6.0",
     "grunt-contrib-qunit": "~0.2.0",
@@ -27,4 +31,4 @@
     "grunt-banner": "~0.2.2",
     "grunt-contrib-cssmin": "~0.9.0"
   }
-}
+}