Merging
Merge branch 'master' of https://github.com/IMQS/Omicron.git

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