Fix header, update spanish translation, JIN-110, JIN-109, JIN-118
Merge branch 'test' of https://github.com/project-fifo/jingles into test

Conflicts:
	app/views/machine.html
Update config.js.example, build dist
Merge branch 'test' into dev

Conflicts:
	dist/index.html
	dist/scripts/0ef6f798.vnc.js
	dist/scripts/89b1d21e.vnc.js
	dist/scripts/b04f0d79.vnc.js
	dist/scripts/c4af34c0.bower_components.js
	dist/views/machine.html
	dist/vnc.html
Regenerate the dist directory