test
恢复index.php
首页界面修改
首页界面修改
Merge branch 'master' into robin

Conflicts:
	index.php
	nbproject/private/private.xml
	themes/default/views/layouts/main.php
uc同步注册及uid隐射表

1
使用UC进行登录

rt
Merge branch 'robin' of https://github.com/yhxxlm/uscar into robin