Merge pull request #7 from gion/dev

bug fix

Author: gion

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appShortName__",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "manifest_version": 2,
   "description": "__MSG_appDescription__",
   "icons": {

app/scripts/options.js

@@ -7,7 +7,7 @@ angular.module('bitShip', []);
 
 angular
   .module('bitShip')
-    .controller('bitShipOptionsController', bitShipOptionsController);
+    .controller('bitShipOptionsController', ['$scope', bitShipOptionsController]);
 
 function bitShipOptionsController($scope) {
 

gulpfile.js

@@ -10,8 +10,8 @@ gulp.task('build', function(callback) {
       'html',
       'images',
       'locales',
-      'manifest',
       'scripts',
+      'manifest',
       'styles'
     ],
     'package',
@@ -34,13 +34,13 @@ gulp.task('watch', function(callback) {
       'html:dev',
       'images:dev',
       'locales:dev',
-      'manifest:dev',
       'scripts:dev',
+      'manifest:dev',
       'styles:dev'
     ],
     callback);
 });
 
 gulp.task('default', [
   'build'
-]);
+]);