5122: Merge supungs/GSoC13 template editor:
https://github.com/supungs/AContent/