Merge branch 'develop'
fixed copy problem with no admin users
Merge branch 'master' into develop