完善
完善
完善
Miya修改connectionStr
Merge branch 'master' of https://bitbucket.org/LyonsGu/jusns
完善
index及其他小细节修改--Miya
Merge branch 'master' of https://bitbucket.org/LyonsGu/jusns
完善
fake 积分商城
Merge branch 'master' of https://bitbucket.org/LyonsGu/jusns

Conflicts:
	JuSNS.Web/template/blue/index.html
Merge branch 'master' of https://bitbucket.org/LyonsGu/jusns

Conflicts:
	JuSNS.Web/template/blue/index.html
修改课件教案分页
简单修改
修改官方配置文件，增加家庭教育等
Merge branch 'master' of https://bitbucket.org/LyonsGu/jusns
完善
Merge branch 'master' of https://bitbucket.org/LyonsGu/jusns
2月17日晚刘强修改
Merge branch 'master' of https://bitbucket.org/LyonsGu/jusns