Merge of Dev into Master

- Added more admin functionality (more of a test really)
- Updated ```composer.json``` to be valid