Some changes.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	web-app/WEB-INF/eisviewer.html
	web-app/css/eis.css