204div
Update game_manager.js
Update html_actuator.js
Update html_actuator.js
Update main.css
Merge branch 'master' into gh-pages

Conflicts:
	js/game_manager.js
	js/html_actuator.js
	style/main.css