I created some features for orders
90% work
95% work
This project's version is latest
Merge branch 'master' of https://github.com/ArsenyNevsky/DeliveryWater

Conflicts:
	.idea/dictionaries/erafiil.xml
	.idea/workspace.xml
	DeliveryWater/settings.py
	DeliveryWater/settings.pyc
	DeliveryWater/urls.py
	DeliveryWater/urls.pyc
	db.inwater
	inwater/views.py
	inwater/views.pyc
	templates/makeOrder.html
	templates/news.html
	templates/registration/login.html