diff --git a/tasks/config/requirejs.js b/tasks/config/requirejs.js
@@ -0,0 +1,19 @@
+module.exports = function(grunt) {
+
+  grunt.config.set('requirejs', {
+    compile: {
+      options: {
+        uglify2: {
+             mangle: false
+         },
+         baseUrl: ".tmp/public/js/",
+         mainConfigFile: ".tmp/public/js/main.js",
+         name: 'main',
+         out: ".tmp/public/js/main2.js",
+         optimize: 'uglify2'
+      }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-requirejs');
+};
diff --git a/tasks/register/compileAssets.js b/tasks/register/compileAssets.js
@@ -19,6 +19,8 @@ module.exports = function(grunt) {
     'less:dev',
     'copy:dev',
     'jade:dev',
-    'coffee:dev'
+    'coffee:dev',
+    'ngtemplates',
+    'requirejs'
   ]);
 };
diff --git a/views/layout.ejs b/views/layout.ejs
@@ -79,6 +79,6 @@
 
     <script src="http://maps.google.com/maps/api/js"></script>
     <script src="js/vendor/markerclusterer.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.22/require.js" data-main="js/main.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.22/require.js" data-main="js/main2.js"></script>
   </body>
 </html>