change file extensions from tpl to twig
rename files extensions from *.tpl to *.twig
Merge branch 'master' of github.com:neocart/neocart

Conflicts:
	upload/admin/view/template/catalog/attribute_form.twig