JIN-105, JIN-115, JIN116, SNIF-25
Merge branch 'test' into dev

Conflicts:
	dist/index.html
	dist/scripts/0ef6f798.vnc.js
	dist/scripts/4cdffc62.vnc.js
	dist/scripts/b04f0d79.vnc.js
	dist/views/machine.html
	dist/vnc.html