Bug fix and updated web page
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Updates to template processor and editor
Merge pull request #253 from mballance-sf/master

Template changes