AAAA
xxx
Merge branch 'master' of ssh://git@github.com/hisandliu/eShengjing.git
Merge branch 'master' of ssh://git@github.com/hisandliu/eShengjing.git

Conflicts:
	JavaCode/src/config.properties