Merge branch 'master'
Merge branch 'master'
2
Merge branch 'master'
оплата
Merge branch 'alexey'
правка фоток
чат
Merge branch 'alexey'

Conflicts:
	webshop/static/css/style.css
чат
Merge branch 'master'
чат
Merge branch 'alexey'
добавлен loader
Merge branch 'master'
Merge branch 'github.com_alexey/master'
Merge branch 'master'
поправочки
Merge branch 'work'