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

Fix for admin panel on non CMS pages
Fix for admin panel on non CMS pages
Fixed issue with form dialog
Merge remote-tracking branch 'upstream/master'
Merge pull request #272 from jerv13/master

Fixed issue with form dialog
Merge pull request #271 from wshafer/master

Fix for admin panel on non CMS pages