i18n
Merge remote-tracking branch 'origin/master'

Conflicts:
	forms.pyc
	models.pyc
	views.pyc
Merge remote-tracking branch 'origin/master'

Conflicts:
	forms.pyc
	models.pyc
	views.pyc