Merge branch 'development' into f/or_support
datastore api OR implementation plus initial tests
Update to OR algorithm, implement and testing support through Core Data
Finish tests for OR, add error checks for duplicate keys where IN should be used
Merge branch 'f/or_support' into development