editMasterTemplate
Merge branch 'editSomething'