Core Data + Local DataStore soo clooose
Merge remote-tracking branch 'origin/master'