#4 머지테스트3
#4 머지테스트4
Merge branch 'Developer' into Velmont

Conflicts:
	core/src/com/mygdx/game/screens/OptionScreen.java
Merge branch 'Developer' into NakOh