update percent
add homepage
update ..
conflicts
。。
Merge branch 'master' of https://github.com/LuckyStars/nbc

Conflicts:
	function-schoolmaster2/java/function-schoolmaster2/src/main/com/nbcedu/function/schoolmaster2/biz/impl/SM2MasterSubBizImpl.java
	sm2/WebRoot/function/function-masterSubList/daibanshiyi.jsp