Doing more stuff
Merge remote-tracking branch 'origin/joca' ; Also adding and fixing lots of things

Conflicts:
	GUI/Analyser.m