Merge pull request #4 from wangzhaojiang/master

同步代码
Merge pull request #17 from Jensyn/master

Merge pull request #4 from wangzhaojiang/master
Merge pull request #5 from wangzhaojiang/master

同步代码
update @split()
Merge pull request #18 from dazzle111/master

merge
Merge pull request #19 from Jensyn/master

Merge pull request #5 from wangzhaojiang/master
Merge pull request #6 from wangzhaojiang/master

同步代码
Merge branch 'master' of github.com:wangzhaojiang/Network-learning-platform
update user class
Merge pull request #20 from Jensyn/master

Merge pull request #6 from wangzhaojiang/master
Merge pull request #7 from wangzhaojiang/master

同步代码
update
Merge branch 'master' of github.com:wangzhaojiang/Network-learning-platform
update
Merge pull request #21 from Jensyn/master

Merge pull request #7 from wangzhaojiang/master
update
Merge branch 'master' of github.com:wangzhaojiang/Network-learning-platform
relation 对接
Merge pull request #5 from wangzhaojiang/master

update