Merge branch 'develop' of https://github.com/euricom/bootcamp-show into develop

Conflicts:
	src/client/app/index.html