Add game control
Add new texture map
Merge branch 'develop' into gh-pages

Conflicts:
	bower.json