Merge pull request #11 from Flamdoodle/admin

Admin
Merge pull request #12 from Flamdoodle/development

Development
Merge branch 'master' of https://github.com/Flamdoodle/before-move into admin