Initial work on templates panel, and minor bug fixes
Merge branch 'master' of https://github.com/mawuli-ypa/mod_zdt

* 'master' of https://github.com/mawuli-ypa/mod_zdt:
  Update TODO