Merge origin/master

Conflicts:
	public_html/include/script/services/WizardViewsService.js