refs #11: forgot to delete this file last issue
refs #11: base templates for the win
Merge branch 'master' into issue_11