Freemarker stuff started
Merge branch 'develop' of https://github.com/madmaggie/util into develop