Added translation markers
Merge remote-tracking branch 'origin/master' into translations

Conflicts:
	nutrition/forms.py
	nutrition/models.py
Merge pull request #11 from caktus/translations

Add translation markers