修改描述
修改
Merge branch 'master' of github.com:webcoding/cnBootstrap

Conflicts:
	WF/common/footer.html
	WF/index.php