Merge origin/master

Conflicts:
	public_html/views/wizardviews/Vendor.html