update all bug
update add bug
Merge branch 'dev' of github.com:liwenyu/srun into dev

Conflicts:
	admin/controllers/AboutController.php
	admin/views/about/_form.php
	admin/views/about/create.php
	admin/views/about/dynamic.php
	admin/views/about/hezuo.php
	admin/views/about/index.php
	admin/views/about/view.php
	admin/views/doc/index.php
	admin/views/layouts/main.php
	common/models/System.php
	frontend/controllers/AboutController.php
	frontend/controllers/CaseController.php
	frontend/views/about/dynamic-right-view.php
	frontend/views/about/index-right-view.php
	frontend/views/about/job-right-view.php
	frontend/views/case/index-right-view.php
	frontend/views/case/index.php
	frontend/views/case/kehu-right-view.php
	frontend/views/case/kehu.php
	frontend/views/demo/cunchu-right-view.php
	frontend/views/demo/index-right-view.php
	frontend/views/layouts/nav.php