Bugfixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	findbursts_gui.m
Merge remote-tracking branch 'origin/master'