Working version of development/production build
Merge branch 'develop' into feature/grunt_dev_prod_env

Conflicts:
	client/views/index.jade
Added css minify
Merge branch 'develop' into feature/grunt_dev_prod_env
Merge branch 'feature/grunt_dev_prod_env' into develop