Merge branch '18-user-administration-panel'
Slight copy changes for sidebar.
Merge branch 'master' into 89-cache
Merge branch '89-cache'
Merge branch 'master' into staging