Added the user can overwrite the template of extensions inside the html folder in core and plugin
Merge remote-tracking branch 'origin/master'