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

Conflicts:
	TownSimulator/src/com/TownSimulator/utility/VoicePlayer.java
Merge branch 'master' of https://github.com/LuciusYu/TownSimulator.git

Conflicts:
	TownSimulator/src/com/TownSimulator/utility/ResourceManager.java
	TownSimulator/src/com/TownSimulator/utility/VoicePlayer.java