changes to web related files
Merge branch 'master' of https://github.com/IMQS/Omicron

Conflicts:
	code/src/web/html/index.html