Fixed gruntfile to add css and js minify
Merge branch 'develop' into sign-up-a-user