Merge branch 'github.com_alexey/master'
settings
тест
тест мастер
Merge branch 'work'

Conflicts:
	webshop/templates/base.html
добавлена админка
Merge branch 'work'
Merge branch 'github.com_alexey/master'
исправлен dajax
Merge branch 'master'
Merge branch 'work'
Merge branch 'master'
добавлена админка в статику
подредактировал админку
commint
setings
Merge branch 'work'

Conflicts:
	webshop/static/admin/css/base.css
	webshop/static/admin/css/forms.css
удалено лишнее
Merge branch 'github.com_alexey/master'

Conflicts:
	webshop/static/css/style.css
Merge branch 'github.com_alexey/master'

Conflicts:
	webshop/static/css/style.css