merge fix
report fix
New user management
Merge remote-tracking branch 'Jack/master' into develop