sound
Merge branch 'master' of https://github.com/LuciusYu/TownSimulator.git

Conflicts:
	TownSimulator-android/src/bgm/BGMPlayer.java
	TownSimulator/src/com/TownSimulator/ui/UIManager.java