index on master: aa29b30 增加测试页面，验证bootstrap在移动端的表现
untracked files on master: aa29b30 增加测试页面，验证bootstrap在移动端的表现
On master: save
Merge commit '305820540af8535fc4dbdd9df07ab78a64040eec'

Conflicts:
	Application/Wechat/Controller/AddonsController.class.php
Merge branch 'master' of github.com:shaoxianhui/guodaxia
QyController.class.php改名为CheckinController.class.php