update cloud
Merge remote-tracking branch 'origin/Serialize' into Serialize

Conflicts:
	TrapEase.xcworkspace/xcshareddata/TrapEase.xccheckout
Merge branch 'Serialize' of https://github.com/ltg-uic/PhotoMAT into Serialize
Merge branch 'Serialize' of https://github.com/ltg-uic/PhotoMAT into Serialize
xcshared data