Added role and permission
Merge branch '1.1-SNAPSHOT' of https://github.com/myriadeas/integral into 1.1-SNAPSHOT