Merge remote-tracking branch 'origin/Master2' into Master2
General classes
Merge remote-tracking branch 'origin/Master2' into Alex

Conflicts:
	BioFarm_NEW/BioFarm/BioFarm.xcodeproj/project.pbxproj
Merge branch 'Alex' into Jackson-
confilcts

Conflicts:
	BioFarm_NEW/BioFarm/BioFarm.xcodeproj/project.pbxproj
more conflicts