可以正常使用了
Merge branch 'master' of https://github.com/Syslab-B/BBBs

Conflicts:
	thinkphp_bookfun/bookfun/Public/a/css/_notes/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
	thinkphp_bookfun/bookfun/Public/a/css/_notes/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.js
	thinkphp_bookfun/bookfun/Public/a/css/_notes/js/bootstrap.min.js
	thinkphp_bookfun/bookfun/Public/a/css/_notes/js/jquery.min.js
	thinkphp_bookfun/bookfun/Public/a/css/bootstrap-glyphicons.css
	thinkphp_bookfun/bookfun/Public/a/css/bootstrap-theme.min.css
	thinkphp_bookfun/bookfun/Public/a/css/bootstrap-wysihtml5/bootstrap3-wysihtml5.css
	thinkphp_bookfun/bookfun/Public/a/css/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css
	thinkphp_bookfun/bookfun/Public/a/css/bootstrap.css
	thinkphp_bookfun/bookfun/Public/a/css/bootstrap.min.css
	thinkphp_bookfun/bookfun/Public/a/css/flat-ui.min.css
	thinkphp_bookfun/bookfun/Public/a/css/fonts/glyphicons-halflings-regular.eot
	thinkphp_bookfun/bookfun/Public/a/css/fonts/glyphicons-halflings-regular.svg
	thinkphp_bookfun/bookfun/Public/a/css/fonts/glyphicons-halflings-regular.ttf
	thinkphp_bookfun/bookfun/Public/a/css/fonts/glyphicons-halflings-regular.woff
	thinkphp_bookfun/bookfun/Public/a/css/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
	thinkphp_bookfun/bookfun/Public/a/css/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.js
	thinkphp_bookfun/bookfun/Public/a/css/js/bootstrap.min.js
	thinkphp_bookfun/bookfun/Public/a/css/js/jquery.min.js
	thinkphp_bookfun/bookfun/Public/a/css/master.css
	thinkphp_bookfun/bookfun/Public/a/css/style.css
	thinkphp_bookfun/bookfun/Public/a/fonts/glyphicons-halflings-regular.eot
	thinkphp_bookfun/bookfun/Public/a/fonts/glyphicons-halflings-regular.svg
	thinkphp_bookfun/bookfun/Public/a/fonts/glyphicons-halflings-regular.ttf
	thinkphp_bookfun/bookfun/Public/a/fonts/glyphicons-halflings-regular.woff
	thinkphp_bookfun/bookfun/Public/a/images/QQ图片2014101105249.jpg
	thinkphp_bookfun/bookfun/Public/a/images/bg.gif
	thinkphp_bookfun/bookfun/Public/a/images/btn.gif
	thinkphp_bookfun/bookfun/Public/a/images/com.jpg
	thinkphp_bookfun/bookfun/Public/a/images/delete.gif
	thinkphp_bookfun/bookfun/Public/a/images/image_01.gif
	thinkphp_bookfun/bookfun/Public/a/images/image_02.gif
	thinkphp_bookfun/bookfun/Public/a/images/image_03.gif
	thinkphp_bookfun/bookfun/Public/a/images/image_04.gif
	thinkphp_bookfun/bookfun/Public/a/images/image_05.gif
	thinkphp_bookfun/bookfun/Public/a/images/image_06.gif
	thinkphp_bookfun/bookfun/Public/a/images/image_07.gif
	thinkphp_bookfun/bookfun/Public/a/images/image_08.gif
	thinkphp_bookfun/bookfun/Public/a/images/image_09.jpg
	thinkphp_bookfun/bookfun/Public/a/images/image_10.gif
	thinkphp_bookfun/bookfun/Public/a/images/image_11.gif
	thinkphp_bookfun/bookfun/Public/a/images/image_12.gif
	thinkphp_bookfun/bookfun/Public/a/images/index_01.gif
	thinkphp_bookfun/bookfun/Public/a/images/index_02.gif
	thinkphp_bookfun/bookfun/Public/a/images/index_03.gif
	thinkphp_bookfun/bookfun/Public/a/images/index_04.gif
	thinkphp_bookfun/bookfun/Public/a/images/index_05.jpg
	thinkphp_bookfun/bookfun/Public/a/images/index_06.gif
	thinkphp_bookfun/bookfun/Public/a/images/index_07.gif
	thinkphp_bookfun/bookfun/Public/a/images/index_08.gif
	thinkphp_bookfun/bookfun/Public/a/images/index_09.gif
	thinkphp_bookfun/bookfun/Public/a/images/update.gif
	thinkphp_bookfun/bookfun/Public/a/images/xing.gif
	thinkphp_bookfun/bookfun/Public/a/img/141391119970924.gif
	thinkphp_bookfun/bookfun/Public/a/img/141391232975391.gif
	thinkphp_bookfun/bookfun/Public/a/img/TB1ML5mGFXXXXbvXpXXvKyzTVXX-520-280.jpg
	thinkphp_bookfun/bookfun/Public/a/img/TB1xmBCGFXXXXcDXFXXvKyzTVXX-520-280.jpg
	thinkphp_bookfun/bookfun/Public/a/img/TB2HjX3aVXXXXbTXXXXXXXXXXXX_!!2250860980.jpg
	thinkphp_bookfun/bookfun/Public/a/img/bg_x1.png
	thinkphp_bookfun/bookfun/Public/a/img/s27356225.jpg
	thinkphp_bookfun/bookfun/Public/a/img/s27401345.jpg
	thinkphp_bookfun/bookfun/Public/a/img/s27401489.jpg
	thinkphp_bookfun/bookfun/Public/a/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
	thinkphp_bookfun/bookfun/Public/a/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.js
	thinkphp_bookfun/bookfun/Public/a/js/bootstrap.min.js
	thinkphp_bookfun/bookfun/Public/a/js/jquery-1.11.1.min.js
	thinkphp_bookfun/bookfun/Public/a/js/jquery.min.js
	thinkphp_bookfun/bookfun/Public/i/css/_notes/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
	thinkphp_bookfun/bookfun/Public/i/css/_notes/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.js
	thinkphp_bookfun/bookfun/Public/i/css/_notes/js/bootstrap.min.js
	thinkphp_bookfun/bookfun/Public/i/css/_notes/js/jquery.min.js
	thinkphp_bookfun/bookfun/Public/i/css/bootstrap-glyphicons.css
	thinkphp_bookfun/bookfun/Public/i/css/bootstrap-theme.min.css
	thinkphp_bookfun/bookfun/Public/i/css/bootstrap-wysihtml5/bootstrap3-wysihtml5.css
	thinkphp_bookfun/bookfun/Public/i/css/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css
	thinkphp_bookfun/bookfun/Public/i/css/bootstrap.css
	thinkphp_bookfun/bookfun/Public/i/css/bootstrap.min.css
	thinkphp_bookfun/bookfun/Public/i/css/fonts/glyphicons-halflings-regular.eot
	thinkphp_bookfun/bookfun/Public/i/css/fonts/glyphicons-halflings-regular.svg
	thinkphp_bookfun/bookfun/Public/i/css/fonts/glyphicons-halflings-regular.ttf
	thinkphp_bookfun/bookfun/Public/i/css/fonts/glyphicons-halflings-regular.woff
	thinkphp_bookfun/bookfun/Public/i/css/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
	thinkphp_bookfun/bookfun/Public/i/css/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.js
	thinkphp_bookfun/bookfun/Public/i/css/js/bootstrap.min.js
	thinkphp_bookfun/bookfun/Public/i/css/js/jquery.min.js
	thinkphp_bookfun/bookfun/Public/i/css/master.css
	thinkphp_bookfun/bookfun/Public/i/css/style.css
	thinkphp_bookfun/bookfun/Public/i/fonts/glyphicons-halflings-regular.eot
	thinkphp_bookfun/bookfun/Public/i/fonts/glyphicons-halflings-regular.svg
	thinkphp_bookfun/bookfun/Public/i/fonts/glyphicons-halflings-regular.ttf
	thinkphp_bookfun/bookfun/Public/i/fonts/glyphicons-halflings-regular.woff
	thinkphp_bookfun/bookfun/Public/i/img/141391119970924.gif
	thinkphp_bookfun/bookfun/Public/i/img/141391232975391.gif
	thinkphp_bookfun/bookfun/Public/i/img/bg_x1.png
	thinkphp_bookfun/bookfun/Public/i/img/s27356225.jpg
	thinkphp_bookfun/bookfun/Public/i/img/s27401345.jpg
	thinkphp_bookfun/bookfun/Public/i/img/s27401489.jpg
	thinkphp_bookfun/bookfun/Public/i/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
	thinkphp_bookfun/bookfun/Public/i/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.js
	thinkphp_bookfun/bookfun/Public/i/js/bootstrap.min.js
	thinkphp_bookfun/bookfun/Public/i/js/jquery-1.11.1.min.js
	thinkphp_bookfun/bookfun/Public/i/js/jquery.min.js
	thinkphp_bookfun/bookfun/Public/v/css/_notes/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
	thinkphp_bookfun/bookfun/Public/v/css/_notes/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.js
	thinkphp_bookfun/bookfun/Public/v/css/_notes/js/bootstrap.min.js
	thinkphp_bookfun/bookfun/Public/v/css/_notes/js/jquery.min.js
	thinkphp_bookfun/bookfun/Public/v/css/bootstrap-glyphicons.css
	thinkphp_bookfun/bookfun/Public/v/css/bootstrap-theme.min.css
	thinkphp_bookfun/bookfun/Public/v/css/bootstrap-wysihtml5/bootstrap3-wysihtml5.css
	thinkphp_bookfun/bookfun/Public/v/css/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css
	thinkphp_bookfun/bookfun/Public/v/css/bootstrap.css
	thinkphp_bookfun/bookfun/Public/v/css/bootstrap.min.css
	thinkphp_bookfun/bookfun/Public/v/css/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
	thinkphp_bookfun/bookfun/Public/v/css/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.js
	thinkphp_bookfun/bookfun/Public/v/css/js/bootstrap.min.js
	thinkphp_bookfun/bookfun/Public/v/css/js/jquery.min.js
	thinkphp_bookfun/bookfun/Public/v/css/master.css
	thinkphp_bookfun/bookfun/Public/v/css/style.css
	thinkphp_bookfun/bookfun/Public/v/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
	thinkphp_bookfun/bookfun/Public/v/js/bootstrap-wysihtml5/bootstrap3-wysihtml5.js
	thinkphp_bookfun/bookfun/Public/v/js/bootstrap.min.js
	thinkphp_bookfun/bookfun/Public/v/js/jquery.min.js
	thinkphp_bookfun/bookfun/bookfun/Conf/config.php
	thinkphp_bookfun/bookfun/bookfun/Lib/Action/BookCenterAction.class.php
	thinkphp_bookfun/bookfun/bookfun/Lib/Action/MainPageAction.class.php
	thinkphp_bookfun/bookfun/bookfun/Lib/Action/PersonalCenterAction.class.php
	thinkphp_bookfun/bookfun/bookfun/Runtime/Cache/06ad3bc29ddff00bd01cfa352b2addc4.php
	thinkphp_bookfun/bookfun/bookfun/Runtime/Cache/286a13d13d63aafe027e204a21a0bc68.php
	thinkphp_bookfun/bookfun/bookfun/Runtime/Cache/29b96f4e370e1e701bf60c11c2cca2a2.php
	thinkphp_bookfun/bookfun/bookfun/Runtime/Cache/8670e9613192d46b1082afb091878a07.php
	thinkphp_bookfun/bookfun/bookfun/Runtime/Cache/c0040beea77dbb89dad4044023c6d2c3.php
	thinkphp_bookfun/bookfun/bookfun/Runtime/Cache/c0afe5b75fedb0e98d0f2fa544598055.php
	thinkphp_bookfun/bookfun/bookfun/Runtime/Cache/d5016badc3c509ccbd6269af98407e6a.php
	thinkphp_bookfun/bookfun/bookfun/Runtime/Cache/f9e3a4cc518850d9da9e4e8dfee60209.php
	thinkphp_bookfun/bookfun/bookfun/Runtime/~runtime.php
	thinkphp_bookfun/bookfun/bookfun/Tpl/BookCenter/bs_show.html
	thinkphp_bookfun/bookfun/bookfun/Tpl/BookCenter/hot_book.html
	thinkphp_bookfun/bookfun/bookfun/Tpl/BookCenter/search_book.html
	thinkphp_bookfun/bookfun/bookfun/Tpl/BookCenter/upload_show.html
	thinkphp_bookfun/bookfun/bookfun/Tpl/Login/index.html
	thinkphp_bookfun/bookfun/bookfun/Tpl/MainPage/classify.html
	thinkphp_bookfun/bookfun/bookfun/Tpl/MainPage/main_page.html
	thinkphp_bookfun/bookfun/bookfun/Tpl/PersonalCenter/center_show.html
	thinkphp_bookfun/bookfun/bookfun/Tpl/PersonalCenter/my_collection.html