Merge pull request #93 from wshafer/master

Fix for saving templates from a staged page
Merge remote-tracking branch 'upstream/master'
Revert change to theme.