Merge origin/master

Conflicts:
	templates/FrontendProduct.html
	templates/actions/settings/Settings.html