master profile set to admin
Merge branch 'uidev'