Merge branch 'master' of https://github.com/chirowong/cms into wzl

Conflicts:
	src/main/java/com/qatang/cms/CmsAuthorizingRealm.java
	src/main/java/com/qatang/cms/controller/role/RoleController.java
	src/main/java/com/qatang/cms/form/PageInfo.java
	src/main/java/com/qatang/cms/service/impl/role/RoleServiceImpl.java
	src/main/java/com/qatang/cms/service/role/RoleService.java
	src/main/webapp/WEB-INF/layouts/default.jsp
	src/main/webapp/WEB-INF/views/resource/resourceInput.jsp
	src/main/webapp/WEB-INF/views/resource/resourceList.jsp