settingsActivity, game_room layout changed
Merge branch 'master' of https://github.com/HalliGalli/PowerHangmanClient

Conflicts:
	res/values/strings.xml
	src/com/haligali/PowerHangmanClient/Game/HangmanGameActivity.java
	src/com/haligali/PowerHangmanClient/Menus/MainMenuActivity.java
	src/com/haligali/PowerHangmanClient/Menus/RankingsActivity.java