lvyang commit
Merge branch 'master' of https://github.com/kliyes/repo.bookstore

Conflicts:
	bookstore/local_settings.py
Merge branch 'master' of https://github.com/kliyes/repo.bookstore

Conflicts:
	.gitignore