Merge branch 'bstable'

Gruntfile.coffee

@@ -361,10 +361,12 @@ module.exports = (grunt) ->
     ]
 
   grunt.registerTask 'beta', [
+    'checkbranch:master'
     'shell:beta'
   ]
 
   grunt.registerTask 'stable', [
+    'checkbranch:bstable'
     'shell:stable'
   ]
 

npm-shrinkwrap.json

@@ -197,6 +197,16 @@
         }
       }
     },
+    "grunt-checkbranch": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/grunt-checkbranch/-/grunt-checkbranch-0.3.1.tgz",
+      "dependencies": {
+        "shelljs": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"
+        }
+      }
+    },
     "grunt-concurrent": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/grunt-concurrent/-/grunt-concurrent-1.0.0.tgz",

package.json

@@ -44,6 +44,7 @@
   "devDependencies": {
     "font-awesome": "4.3.0",
     "grunt": "^0.4.5",
+    "grunt-checkbranch": "^0.3.1",
     "grunt-concurrent": "^1.0.0",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-coffee": "^0.13.0",