sync
Merge branch 'master' of https://github.com/ineuron/NeuroDAQ-Analysis

Conflicts:
	analysis/__init__.pyc
	analysis/auxfuncs.pyc
	analysis/toolselector.pyc
	util/pgfuncs.pyc
	widgets/AnalysisSelectWidget.pyc
	widgets/AnalysisStackWidget.pyc
	widgets/__init__.pyc