close #44
Merge branch 'master' of github.com:songlipeng2003/christy

Conflicts:
	protected/models/Book.php