Core data linked — text, video, image done
Merge remote-tracking branch 'origin/master'