2014-1-2 白天工作
Merge remote-tracking branch 'origin/master' into ztong

Conflicts:
	src/com/neutronstar/neutron/NeutronService.java