- working on adding client side templating stored in localStorage, and reading templates in parallel from disk before serving as json
Merge remote-tracking branch 'origin/master'