Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Add users and groups administration functionalities
Merge branch 'master' into raysmond