grunt code
Merge branch 'master' of https://github.com/leofle/game

Conflicts:
	js/build/production.min.js