grunt build tryout
Merge branch 'master' of github.com:bevacqua/NBrut

Conflicts:
	Gruntfile.js
	src/static/config/assets.js