Merge branch 'master' of /home/dmitry/django/project with conflicts.
mac_bg