a few changes
Trying to merge some files after conflict resolution
Merge branch 'master' of https://github.com/efferencecopy/codebase

Conflicts:
	General/defineLocalPaths.m