small changes
Merge branch 'dev_analysis' of https://github.com/efferencecopy/codebase into dev_analysis

Conflicts:
	MouseView/anlyMod_pulseTrains_stimLoc.m