make rulers last
Merge branch 'master' into spikesorting

Conflicts:
	src/AudioView.cpp
leftover rulerStart
Merge branch 'master' into spikesorting