CRAFTER-640 and CRAFTER-1210
Merge branch 'master' of https://github.com/craftercms/profile
Merge branch 'master' of https://github.com/craftercms/profile
Merge branch 'master' of https://github.com/craftercms/profile
Checking if getRoles is null
Merge branch 'master' of https://github.com/craftercms/profile

Conflicts:
	crafter-security-provider/src/main/java/org/craftercms/security/api/UserProfile.java
CRAFTER-1210: Code improvements
Minor fixes
CRAFTER-1030: Security Provider library integration
Merge branch 'master' of https://github.com/craftercms/profile