Rename content pages
Pages and menu titles
Merge remote-tracking branch 'upstream/master'
Fixes user creation with role admin
Merge pull request #786 from solispauwels/master

Rename content pages
Merge pull request #787 from kitan1982/bugfix

Fixes user creation with role admin