Fixing unit tests for xcode 5.1
Merge branch 'crash' into miya-offline
Merge branch 'miya-offline' into offline-core-data