Merge branch 'master' of github.com:WeiMing2014/news

Conflicts:
	logout.php
Merge branch 'master' of github.com:WeiMing2014/news

Conflicts:
	logout.php

Signed-off-by: LZZ <lzz19930210@163.com>