dood
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/bluexin/misgaea/PlayerRace/CelestialHost.java
Merge remote-tracking branch 'origin/master'
dood
Merge remote-tracking branch 'origin/master'