Merge pull request #1 from tianlu1677/master

finish hot_theme & friend_site
单点登录功能开发
单点登录功能开发
单点登录功能开发
单点登录功能开发
fix conflict