added modeltranslation
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/blog/models.py