commit by thinkpad with 20140921
commit master branch by thinkpad on 20140921
Merge branch 'dev_thinkpad'

Conflicts:
	books/models.pyc