Merge origin/master

Conflicts:
	src/java/com/jskj/assets/server/entity/Churukudantb.java
Merge origin/master

Conflicts:
	src/com/jskj/asset/client/bean/entity/Baosuntb.java