Merge remote-tracking branch 'upstream/master'
Finished Save as template, Draft menu, and Restore menu
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #139 from wshafer/master

Finished Save as template, Draft menu, and Restore menu
Merge remote-tracking branch 'upstream/master'