세번째 충돌!!
Merge branch 'develop' of https://github.com/DLUG/GameMafia.git into
develop

Conflicts:
	GameMafia/src/com/anyway/android/gamemafia/LoginActivity.java