commit before pull
commit before pull
admin of templates and display tamplates by url
fixed conflict after pull