20130701

andy
Merge branch 'master' of https://github.com/fanghaibo/Core

Conflicts:
	bin/core.jar
Merge branch 'master' of https://github.com/fanghaibo/Core