Fix for admin panel on non CMS pages
Merge remote-tracking branch 'upstream/master'
Merge pull request #117 from wshafer/master

Fix for admin panel on non CMS pages
Fix for save on sitewides
Merge pull request #118 from wshafer/master

Fix for save on sitewides