Merge pull request #1 from wangzhaojiang/master

^_^
update sql
Merge pull request #1 from shui8023/master

alter
Merge pull request #2 from dazzle111/master

Merge pull request #1 from wangzhaojiang/master
增加接口
Merge branch 'master' of github.com:wangzhaojiang/Network-learning-platform

Conflicts:
	source/jaker_me.sql
alter sql
alter sql
include php
update
改进 function query()
add interface mail.class.php
Merge pull request #2 from wangzhaojiang/master

mery