changes made to the templates
Merged master fixed conflict