Merge pull request #559 from leider/master

no admin concept anymore