줄맞춤
등 기능상 변화없고 코드정리
Merge branch 'master' of https://github.com/gkdlfm/CML

Conflicts:
	DdongGame/DdongGame/bin/classes/kr/co/ddonggame/GameRoom.class
	DdongGame/DdongGame/bin/classes/kr/co/ddonggame/MainActivity$PlaceholderFragment.class
	DdongGame/DdongGame/bin/classes/kr/co/ddonggame/MainActivity.class
	DdongGame/DdongGame/src/kr/co/ddonggame/GameRoom.java
	DdongGame/DdongGame/src/kr/co/ddonggame/MainActivity.java
	DdongGame/DdongGame/src/kr/co/ddonggame/client/Client.java