Merge pull request #1 from wangzhaojiang/master

^_^
update sql
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
alter conn.php
Merge pull request #1 from wangzhaojiang/master

alter conn.php
用户关系的接口文档
add the relation_class  php
Merge pull request #7 from shui8023/master

add the user_relation
Merge pull request #1 from wangzhaojiang/master

update
过滤接口
user类
Merge pull request #8 from dazzle111/master

User类和过滤接口