Add backoffice features
DRY things a little bit
Merge branch 'master' into stable