New Task in Grunt
Merge branch 'master' of https://github.com/BalamTech/Portal

Conflicts:
	js/app.min.js
	node_modules/grunt/package.json