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

Conflicts:
	TownSimulator-android/bin/TownSimulator-android.apk
	TownSimulator-android/bin/classes.dex
	TownSimulator-android/bin/resources.ap_