Allow viewing encounters
add action type selector
More work on storing in Core Data
Enable searching stored patients
Save patients; encounters to Core Data (encrypted)
Save patent visits in Core Data
Store encounter jobs in Core Data
update wording
Merge branch 'master' into offline_patients
add property
Merge branch 'offline_patients' into GCI-48

Conflicts:
	OpenMRS-iOS.xcodeproj/project.pbxproj
	OpenMRS-iOS/AppDelegate.m
	OpenMRS-iOS/OpenMRSAPIManager.m
	OpenMRS-iOS/PatientSearchViewController.m
	Podfile
	Podfile.lock
	Pods/Manifest.lock
	Pods/Pods.xcodeproj/project.pbxproj
	Pods/Target Support Files/Pods-AFNetworking/Pods-AFNetworking-Private.xcconfig
	Pods/Target Support Files/Pods-OpenMRS-iOS-AFNetworking/Pods-OpenMRS-iOS-AFNetworking-Private.xcconfig
	Pods/Target Support Files/Pods-OpenMRS-iOS/Pods-OpenMRS-iOS-acknowledgements.markdown
	Pods/Target Support Files/Pods-OpenMRS-iOS/Pods-OpenMRS-iOS-acknowledgements.plist
	Pods/Target Support Files/Pods-OpenMRS-iOS/Pods-OpenMRS-iOS-environment.h
	Pods/Target Support Files/Pods-OpenMRS-iOS/Pods-OpenMRS-iOS.debug.xcconfig
	Pods/Target Support Files/Pods-OpenMRS-iOS/Pods-OpenMRS-iOS.release.xcconfig
	Pods/Target Support Files/Pods-OpenMRS-iOSTests-AFNetworking/Pods-OpenMRS-iOSTests-AFNetworking-Private.xcconfig
	Pods/Target Support Files/Pods-OpenMRS-iOSTests/Pods-OpenMRS-iOSTests-acknowledgements.markdown
	Pods/Target Support Files/Pods-OpenMRS-iOSTests/Pods-OpenMRS-iOSTests-acknowledgements.plist
	Pods/Target Support Files/Pods-OpenMRS-iOSTests/Pods-OpenMRS-iOSTests-environment.h
	Pods/Target Support Files/Pods-OpenMRS-iOSTests/Pods-OpenMRS-iOSTests.debug.xcconfig
	Pods/Target Support Files/Pods-OpenMRS-iOSTests/Pods-OpenMRS-iOSTests.release.xcconfig
	Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
	Pods/Target Support Files/Pods/Pods-acknowledgements.plist
	Pods/Target Support Files/Pods/Pods-environment.h
	Pods/Target Support Files/Pods/Pods.debug.xcconfig
	Pods/Target Support Files/Pods/Pods.release.xcconfig