diff --git a/Gruntfile.js b/Gruntfile.js
index d5c1bdc20..a05dc6b18 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -119,6 +119,13 @@ module.exports = function(grunt) {
                 // injection
                 mangle: false
             }
+        },
+        ngtemplates: {
+            app: {
+                cwd: 'app',
+                src: 'partials/**.html',
+                dest: 'templates.js'
+            }
         }
     });
 
@@ -129,6 +136,7 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-usemin');
     grunt.loadNpmTasks('grunt-cache-busting');
+    grunt.loadNpmTasks('grunt-angular-templates');
 
     // Default tasks
     grunt.registerTask('build', [
@@ -143,7 +151,8 @@ module.exports = function(grunt) {
         'cssmin',
         'uglify',
         'usemin',
-        'cache-busting'
+        'cache-busting',
+        'ngtemplates'
         ]);
 
 
diff --git a/package.json b/package.json
index ffbb9a541..c68b9aa76 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,8 @@
     "grunt-contrib-uglify": "^0.4.0",
     "grunt-contrib-clean": "^0.5.0",
     "grunt-filerev": "^0.2.1",
-    "grunt-cache-busting": "0.0.10"
+    "grunt-cache-busting": "0.0.10",
+    "grunt-angular-templates": "~0.5.7"
   },
   "scripts": {
     "test": "karma start webapp/config/karma.conf.js --single-run --browsers Firefox"