added users feature
added roles
Merge branch 'feature2' into develop