Merge branch 'master' of https://github.com/qibinlou/BookstoreManagementSystem into qibinlou-master

Conflicts:
	bookcompany.db
	bookcompany/settings.pyc
	bookcompany/urls.pyc
	bookcompany/views.py
	bookcompany/views.pyc
	books/models.pyc
2013.5.3
Merge branch 'master' of https://github.com/qibinlou/BookstoreManagementSystem into qibinlou-master

Conflicts:
	bookcompany.db
all right
delete useless database
delte useless things
deleted *.py~
Merge branch 'master' of https://github.com/normanyahq/BookstoreManagementSystem

Conflicts:
	bookcompany/settings.pyc.BASE.22891.pyc
	bookcompany/views.py