.
,
...
OK
OK2
fix to prevent data duplication
Merge branch 'BenChanges'

Conflicts:
	PowerApp.xcodeproj/project.pbxproj
	PowerApp/AppDelegate.m
	PowerApp/PowerApp.xcdatamodeld/PowerApp.xcdatamodel/contents