关系
关系
Merge branch 'master' of https://github.com/alongken2005/yos

Conflicts:
	application/controllers/api/book.php
	application/controllers/book.php
	application/helpers/common_helper.php
	application/views/api/apitest.php
	application/views/default/apply_author.php
	application/views/default/book_detail.php
	application/views/default/book_edit.php
	application/views/default/css/space.css
	application/views/default/css/style.css
	application/views/default/footer.php
	application/views/default/paysucc.php
	application/views/default/slider_left.php