[weblate] Merge remote-tracking branch 'origin/master' into weblate
[new_egypt_neighbourhood_msg] Added new generic message for neighbourhood drop down in Egypt
[new_egypt_neighbourhood_msg] added french translation for choose your neighbourhood
[new_egypt_neighbourhood_msg] Merge remote-tracking branch 'origin/weblate' into new_egypt_neighbourhood_msg

Conflicts:
	ar_EG/LC_MESSAGES/django.mo
	ar_EG/LC_MESSAGES/django.po
[weblate] Merge branch 'weblate' of github.com:dubizzle/fuego-locale into weblate
[weblate] Merge remote-tracking branch 'origin/new_egypt_neighbourhood_msg' into weblate