Fixes
merge
Merge branch 'master' of github.com:obshtestvo/recycle

Conflicts:
	app/urls.py
	ecomap/services.py
	ecomap/templates/home/get.html