Merge pull request #4 from polonel/develop

Develop to Master

gruntfile.js

@@ -43,7 +43,8 @@ module.exports = function(grunt) {
                 files: [
                     '*.js',
                     'src/**/*.js',
-                    'routes/**/*.js'
+                    'routes/**/*.js',
+                    'plugins/**/*.js'
                 ],
                 tasks: ['express:web'],
                 options: {
@@ -129,7 +130,7 @@ module.exports = function(grunt) {
         },
 
         sass: {
-            build: {
+            dist: {
                 files: {
                     'public/css/app.css': 'src/sass/app.sass'
                 }

package.json

@@ -16,13 +16,15 @@
     "body-parser": "^1.12.3",
     "busboy": "^0.2.9",
     "chance": "^0.8.0",
+    "clone": "^1.0.2",
     "coffee-script": "^1.10.0",
     "connect-flash": "^0.1.1",
     "connect-mongo": "^0.8.1",
     "cookie": "^0.2.3",
     "cookie-parser": "^1.3.4",
     "daemon": "^1.1.0",
     "debug": "^2.1.3",
+    "dive": "^0.5.0",
     "email-templates": "^2.0.1",
     "express": "^4.12.3",
     "express-hbs": "^0.8.4",
@@ -31,10 +33,10 @@
     "grunt-apidoc": "^0.10.1",
     "grunt-contrib-cssmin": "^0.14.0",
     "grunt-contrib-requirejs": "^0.4.4",
-    "grunt-contrib-sass": "^0.9.2",
-    "grunt-shell": "^1.1.2",
     "grunt-contrib-uglify": "^0.11.0",
     "grunt-jsdoc": "^1.0.0",
+    "grunt-sass": "^1.2.0",
+    "grunt-shell": "^1.1.2",
     "handlebars": "^4.0.5",
     "imap": "^0.8.14",
     "kerberos": "0.0.17",
@@ -62,6 +64,7 @@
     "uglify-js": "^2.4.20",
     "underscore": "^1.8.3",
     "underscore.string": "^3.0.3",
+    "unzip": "^0.1.11",
     "util": "^0.10.3",
     "winston": "^2.1.1"
   },