qq登录
Merge branch 'master' of https://github.com/tuishudan/code

Conflicts:
	tuishudan.com/protected/views/layouts/main.php