Merge origin/master

Conflicts:
	src/java/com/jskj/assets/server/dataGen/databaseGen.xml
	src/java/com/jskj/assets/server/servcie/message/MessageService.java