Merge branch 'andre' of https://github.com/dlyapun/sportshop

Conflicts:
	sportshop/settings.py
Merge branch 'andre' of https://github.com/dlyapun/sportshop

Conflicts:
	shop/logic.py
	sportshop/settings.py
	sportshop/urls.py
	templates/base.html

only a gew changes
Social webwork
Merge master and fix