много всего
куча правок
Merge remote-tracking branch 'origin/master'

Conflicts:
	store/store/fixtures/creating_tables.sql
	store/store/models.py
	store/store/urls.py