Merging dev onto 1.8
working on admin-template.php
missing files
Save template working
Save and Restore Defaults working
working on admin-template
working on template