temp
Merge branch 'master' of github.com:kliyes/repo.bookstore

Conflicts:
	bookstore/templates/base/theme_base.html
	bookstore/templates/index.html