game room changes
Merge branch 'master' of https://github.com/HalliGalli/PowerHangmanClient

Conflicts:
	res/layout/GameOverGame.xml
	res/layout/InactiveTimeOutGame.xml
	res/layout/InactiveTimeOutMain.xml
	res/layout/QuitGame.xml
	res/layout/game_over_game.xml
	res/layout/gameover_popup.xml
	res/layout/inactive_time_out_game.xml
	res/layout/inactive_time_out_main.xml
	res/layout/inactive_timeout_game_popup.xml
	res/layout/inactive_timeout_main_popup.xml
	res/layout/quit_game.xml
	res/layout/quit_game_popup.xml