Use ugettext_lazy instead of ugettext to support Django 1.7 migrations
Merge remote-tracking branch 'origin/gettext_lazy'