'task from 20140217'
Merge branch 'master' of github.com:YellowDinar/django-bars