完成初步的主GUI及切換到RoomActivity
Merge remote-tracking branch 'origin/master'

Conflicts:
	Poker/src/main/java/com/weigreen/poker/RoomActivity.java