Merge branch 'master' of /home/nishara/PycharmProjects/yadi with conflicts.
cinema db dump
Merge remote-tracking branch 'origin/master'