setting core data
Merge remote-tracking branch 'origin/master'
long press fixed
Merge remote-tracking branch 'origin/master'