Merge pull request #108 from Edugate/develop

roles mngmt (closes #97) and cleaning code
Merge pull request #109 from Edugate/develop

closes #9
Merge branch 'develop' into 1.x-stable
Merge branch 'develop' into 1.x-stable
Merge pull request #111 from Edugate/develop

update
Merge pull request #112 from Edugate/develop

minor fixes/improves
Merge branch 'develop' into 1.x-stable
minor
minor fixes