Merge branch 'master' of /home/dmitry/django/project with conflicts.
Merge remote-tracking branch 'origin/master'
19.12.2014