Project settings to use dev server
Merge branch 'freematch'
users are not deleted anymore, only made inactive
Merge branch 'master' into freematch