Merge branch 'db' into develop
user role added
Merge branch 'develop' of https://github.com/alhenk/acs into develop