Merge branch 'develop'

Author: william26

Gruntfile.js

@@ -85,7 +85,7 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-jasmine-node');
 
-    grunt.registerTask('bower', 'Creates an updated bower.json to the dist folder', function() {
+    grunt.registerTask('bower', 'Creates an updated bower.json', function() {
         var done = this.async();
         fs.readFile('./templates/bower.json', 'UTF-8', function(e, text) {
             if (e) {
@@ -96,13 +96,13 @@ module.exports = function(grunt) {
             text = text.replace('{{sdk_version}}', package_info.version);
             text = text.replace('{{description}}', package_info.description);
             text = text.replace('{{license}}', package_info.license);
-            fs.writeFile('./dist/bower.json', text, function(e) {
+            fs.writeFile('./bower.json', text, function(e) {
                 if (e) {
                     console.err('A problem occured while creating bower.json');
                     done();
                     return;
                 }
-                console.log("Wrote bower.json file in app/sdk-js/dist/");
+                console.log("Wrote bower.json file");
                 done();
             });
         });

templates/bower.json

@@ -1,7 +1,18 @@
 {
     "name": "oauth-js",
     "version": "{{sdk_version}}",
-    "main": "oauth.min.js",
+    "main": "dist/oauth.min.js",
     "description": "{{description}}",
-    "license": "{{license}}"
+    "license": "{{license}}",
+    "ignore": [
+        "coffee",
+        "coverage",
+        "js",
+        "node_modules",
+        "tests",
+        "templates",
+        "Gruntfile.js",
+        "package.json",
+        ".gitignore"
+    ]
 }