Try to merge by choigoon
Retry to merge by choigoon
Added ClassDiagram for 0.2 and 0.3
Clean dirty comment codes
merge to choigoon
merge choigoon
merge choigoon and change encoding
View arrange margin
Merge branch 'hagi4u' of https://github.com/Family-of-loves/Android into hagi4u

Conflicts:
	src/com/example/wearetherunningman/GameActivity.java
Merge branch 'choigoon' into hagi4u

Conflicts:
	.euml2
	.settings/org.eclipse.core.resources.prefs
	res/layout/contest.xml
	res/layout/fragment_game.xml
	res/layout/fragment_main.xml
	src/com/example/wearetherunningman/DBManager.java
	src/com/example/wearetherunningman/DBManagerHandler.java
	src/com/example/wearetherunningman/GameActivity.java
	src/com/example/wearetherunningman/MainActivity.java
	src/com/example/wearetherunningman/Participant.java
	src/com/example/wearetherunningman/Player.java
	src/com/example/wearetherunningman/WsCallback.java
	src/com/example/wearetherunningman/WsConn.java
merge choigoon
Change encoding UTF-8
버그 해결