重构代码
Merge branch 'master' of ssh://git@github.com/y3shop/simplecms.git

Conflicts:
	src/main/java/com/roki/model/ResourceModel.java
	src/main/java/com/roki/model/RoleModel.java
	src/main/java/com/roki/model/TestModel.java
	src/main/java/com/roki/model/UserModel.java
	src/main/java/com/roki/model/UserRoleModel.java
	src/main/java/com/roki/model/base/BaseModelObject.java