Merge branch 'develop' of https://github.com/contento3/Projects into develop
Merge branch 'develop' of https://github.com/contento3/Projects into develop
Security model , commenting and variable naming still to embroider , also shiro permission link remaining
Merge branch 'develop' of https://github.com/contento3/Projects into develop

Conflicts:
	cmsadmin/src/com/contento3/web/user/security/RoleUIManager.java
	core/src/main/java/com/contento3/security/role/dao/impl/RoleDaoImpl.java
	core/src/main/java/com/contento3/security/role/service/impl/RoleServiceImpl.java