fixed users page when not logged in
Merge branch 'master' into issue_50
Merge branch 'master' into fixRollback