Merge branch 'dev' into users
Rename page header and user logout redirect
Merge branch 'users' into dev