interface changes and swipe
Merge branch 'Serialize' of https://github.com/ltg-uic/PhotoMAT into Serialize
add label nsinteger
Conflicts:
	PhotoMat.xcodeproj/project.pbxproj
	TrapEase.xcworkspace/xcshareddata/TrapEase.xccheckout
Merge remote-tracking branch 'origin/Serialize' into Serialize
closer to saving  for tags
Merge remote-tracking branch 'origin/Serialize' into Serialize
using EUCDatabase
Merge remote-tracking branch 'origin/Serialize' into Serialize
minor changes