fixed many things that once did not work but now do.
Merge branch 'master' of https://github.com/smoss/enoru-eco

Conflicts:
	game/js/game.js
	game/js/main.js
	game/js/resources.js
Merge branch 'master' of https://github.com/smoss/enoru-eco

Conflicts:
	game/data/grass2.png