java script + images
Merge remote-tracking branch 'origin/zend' into zend

Conflicts:
	Zend/module/Game/src/Game/Controller/NewController.php
	Zend/module/Game/src/Game/Controller/Player2Controller.php