django.po Anh Tuan
Merge branch 'master' of https://github.com/Okhoshi/UCL_LINGI2255

Conflicts:
	locale/fr/LC_MESSAGES/django.po