Loading templates in edit mode working.
Merge conflicts solved