basic templates and router complete
Merge branch 'templates'