spring security
Merge branch 'master' of https://github.com/liqian008/designer.git

Conflicts:
	designer-admin/src/main/java/com/bruce/designer/admin/controller/UserProfileController.java
	designer-admin/src/main/java/com/bruce/designer/admin/controller/security/AdminMenuController.java
	designer-admin/src/main/java/com/bruce/designer/admin/controller/security/AdminRoleController.java
	designer-admin/src/main/java/com/bruce/designer/admin/controller/security/AdminUserController.java
	designer-admin/src/main/java/com/bruce/designer/admin/security/WebSecurityMetadataSource.java
	designer-admin/src/main/java/com/bruce/designer/admin/security/WebUserDetailsService.java
	designer-admin/src/main/java/com/bruce/designer/admin/service/impl/AdminMenuServiceImpl.java
	designer-admin/src/main/java/com/bruce/designer/admin/service/impl/AdminRoleServiceImpl.java
	designer-admin/src/main/java/com/bruce/designer/admin/service/impl/AdminUserServiceImpl.java