buyback2.5
Merge branch 'master' of https://github.com/NewBeeStudio/XiChao

Conflicts:
	xichao_web/Index/Runtime/Cache/4cf5199a94c2f08830a8fb0296a28629.php
Merge branch 'master' of https://github.com/NewBeeStudio/XiChao

Conflicts:
	xichao_web/Index/Runtime/Cache/4cf5199a94c2f08830a8fb0296a28629.php
	xichao_web/Index/Runtime/Cache/eb5eb607d77aa49971993cc5252519ee.php
	xichao_web/Index/Runtime/Cache/f9c22b8b40e560036663a0ce7ed378ae.php
add forth page
Merge branch 'master' of https://github.com/NewBeeStudio/XiChao