quick hotfix to master
Merge remote-tracking branch 'origin/master' into development

Conflicts:
	index.html