Updates to reflect last meeting with Ben
Merge branch 'master' of github.com:/uh-nmb/KASPAR

Conflicts:
	Web/gui/build/fullapp.js
	Web/gui/build/modules/actions/directives/sequenceEditor.tpl.html
	Web/gui/src/modules/actions/directives/sequenceEditor.tpl.html
Update build