translation
Merge branch 'testing' of https://github.com/hadi2f244/djangoProject into testing

Conflicts:
	mainProject.db
	mainProject/settings.py