Merge pull request #269 from wshafer/master

Removed unneeded services
Merge pull request #270 from wshafer/master

Fix for admin panel on non CMS pages
Merge remote-tracking branch 'upstream/master'