Merge branch 'develop' into equipment-refactor-merge-into-develop

Gruntfile.js

@@ -75,6 +75,20 @@ module.exports = function(grunt) {
 
     sprite: sprite,
 
+    imagemin: {
+      spritesmith: {
+        options: {
+          optimizationLevel: 7
+        },
+        files: [{
+          expand: true,
+          flatten: true,
+          src: ["common/dist/sprites/*.png"],
+          dest: "common/dist/sprites/"
+        }]
+      }
+    },
+
     cssmin: {
       dist: {
         options: {
@@ -209,7 +223,7 @@ module.exports = function(grunt) {
   });
 
   // Register tasks.
-  grunt.registerTask('compile:sprites', ['clean:sprite', 'sprite', 'cssmin']);
+  grunt.registerTask('compile:sprites', ['clean:sprite', 'sprite', 'imagemin', 'cssmin']);
   grunt.registerTask('build:prod', ['loadManifestFiles', 'clean:build', 'browserify', 'uglify', 'stylus', 'cssmin', 'copy:build', 'hashres','prepare:staticNewStuff']);
   grunt.registerTask('build:dev', ['browserify', 'stylus', 'prepare:staticNewStuff']);
   grunt.registerTask('build:test', ['test:prepare:translations', 'build:dev']);
@@ -250,6 +264,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-concurrent');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-spritesmith');
+  grunt.loadNpmTasks('grunt-contrib-imagemin');
   grunt.loadNpmTasks('grunt-hashres');
   grunt.loadNpmTasks('grunt-karma');
 

bower.json

@@ -14,34 +14,34 @@
     "tests"
   ],
   "dependencies": {
-    "jquery": "~2.1.0",
-    "jquery.cookie": "~1.4.0",
+    "Angular-At-Directive": "snicker/Angular-At-Directive#c27bae207aa06d1e",
+    "BrowserQuest": "browserquest/BrowserQuest#c3a960b03031dad5d",
     "angular": "1.3.9",
-    "angular-ui": "~0.4.0",
-    "angular-sanitize": "1.3.9",
-    "angular-resource": "1.3.9",
-    "angular-ui-utils": "~0.1.0",
-    "angular-ui-select2": "git://github.com/angular-ui/ui-select2.git",
-    "angular-bootstrap": "~0.12.0",
-    "angular-loading-bar": "~0.6.0",
-    "bootstrap": "~3.1.0",
-    "bootstrap-growl": "git://github.com/ifightcrime/bootstrap-growl.git#master",
-    "bootstrap-tour": "~0.10.1",
-    "BrowserQuest": "git://github.com/browserquest/BrowserQuest.git",
-    "github-buttons": "git://github.com/mdo/github-buttons.git",
-    "marked": "~0.2.9",
-    "Angular-At-Directive": "git://github.com/snicker/Angular-At-Directive#master",
-    "js-emoji": "git://github.com/snicker/js-emoji#master",
-    "sticky": "*",
-    "swagger-ui": "git://github.com/wordnik/swagger-ui.git#v2.0.24",
-    "ngInfiniteScroll": "1.0.0",
-    "jquery-colorbox": "~1.4.36",
-    "pnotify": "~1.3.1",
-    "jquery-ui": "~1.10.3",
-    "hello": "~1.5.0",
-    "css-social-buttons": "https://github.com/samcollins/css-social-buttons.git",
+    "angular-bootstrap": "~0.13.0",
     "angular-filter": "~0.5.1",
-    "angular-ui-router": "~0.2.13"
+    "angular-loading-bar": "~0.6.0",
+    "angular-resource": "1.3.9",
+    "angular-sanitize": "1.3.9",
+    "angular-ui": "~0.4.0",
+    "angular-ui-router": "~0.2.13",
+    "angular-ui-select2": "angular-ui/ui-select2#afa6589a54cb72815f",
+    "angular-ui-utils": "~0.1.0",
+    "bootstrap": "~3.1.0",
+    "bootstrap-growl": "ifightcrime/bootstrap-growl#162daa41cd1155f",
+    "bootstrap-tour": "~0.10.1",
+    "css-social-buttons": "samcollins/css-social-buttons#v1.1.1 ",
+    "github-buttons": "mdo/github-buttons#v3.0.0",
+    "hello": "~1.5.0",
+    "jquery": "~2.1.0",
+    "jquery-colorbox": "~1.4.36",
+    "jquery-ui": "~1.10.3",
+    "jquery.cookie": "~1.4.0",
+    "js-emoji": "snicker/js-emoji#f25d8a303f",
+    "marked": "~0.2.9",
+    "ngInfiniteScroll": "1.0.0",
+    "pnotify": "~1.3.1",
+    "sticky": "*",
+    "swagger-ui": "wordnik/swagger-ui#v2.0.24"
   },
   "devDependencies": {
     "angular-mocks": "1.3.9"