refactor
Merge remote-tracking branch 'origin/master' into Dev

Conflicts:
	templates/tasks/config/sails-linker-gulp.js
	templates/tasks/register/buildProd.js
	templates/tasks/register/linkAssets.js
	templates/tasks/register/linkAssetsBuild.js
	templates/tasks/register/linkAssetsBuildProd.js
	templates/tasks/register/prod.js
Merge branch 'Dev'