small change instituted after the big merge
Merge branch 'dev_analysis' of https://github.com/efferencecopy/codebase into dev_analysis
Merge branch 'dev_analysis'

Conflicts:
	PopulationAnalysis/AxonStimAnalysis.m