fixed overlay issue
Merge branch 'Serialize' of https://github.com/ltg-uic/PhotoMAT into Serialize

Conflicts:
	TrapEase.xcworkspace/xcshareddata/TrapEase.xccheckout