Merge branch 'development'
Bug fix that telephone field in user form not showing red star when required
Merge branch 'master' into development