set user default role
merge
Merge branch 'master' into develop
merge develop with remote branch