backed up changes from broken git repo
more backed up changes (new files)
Restore some acquisition fixes from dead git branch
Merge branch 'backup' into pbm-develop

Conflicts:
	acq4/analysis/dataModels/PatchEPhys/PatchEPhys.py
	acq4/analysis/modules/IVCurve/IVCurve.py
	acq4/devices/Scanner/ScanProgram/rect.py
	acq4/modules/TaskRunner/analysisModules/Imaging/Imaging.py
Minor edit
Merge remote-tracking branch 'lcampagn/develop' into develop
Merge remote-tracking branch 'lcampagn/scan_programs' into develop
Merge many new fixes and features from manis
Merge remote-tracking branch 'pbmanis/develop' into develop
Scanner / imaging acquisition bugfixes
Merge remote-tracking branch 'lcampagn/pbm-develop' into develop

Conflicts:
	config/example/modules/Manager_ui.cfg
Merge remote-tracking branch github.com:lcampagn/acq4: ' upstream/develop' into develop