try to change edit templates to use php and not angular
merge conflict
change image height in newsletter