User types added.
Merge branch 'develop'