Draft Layout
Draft Layout
Draft Layout
Merge origin/master

Conflicts:
	app/controllers/Application.java
	app/models/manager/PlayerManager.java
	tmp/bytecode/DEV/_app_views_Application_game.html
	tmp/bytecode/DEV/_app_views_Application_index.html
	tmp/bytecode/DEV/_app_views_Application_player.html
	tmp/bytecode/DEV/_app_views_errors_404.html
	tmp/bytecode/DEV/_play__framework_templates_tags_404.html
	tmp/bytecode/DEV/controllers.Application
	tmp/bytecode/DEV/controllers.Application$RequestSocket
	tmp/bytecode/DEV/controllers.EventHandler
	tmp/bytecode/DEV/controllers.GameJob
	tmp/bytecode/DEV/models.enums.ExchangeCode
	tmp/bytecode/DEV/models.exception.ArbitrageException
	tmp/bytecode/DEV/models.manager.ExchangeManager
	tmp/bytecode/DEV/models.manager.HighScoreUtil
	tmp/bytecode/DEV/models.manager.PlayerManager
	tmp/bytecode/DEV/models.response.HighScoreJSON
	tmp/bytecode/DEV/models.response.RequestJSON
	tmp/classes/controllers/Application$RequestSocket.class
	tmp/classes/controllers/Application.class
	tmp/classes/models/manager/ExchangeManager.class