dev 修改配置文件
Merge branch 'feature/sns_login_20140106' of https://github.com/Tassemble/520wenxiong into feature/sns_login_20140106
Merge branch 'feature/sns_login_20140106' into feature/fast_join_hack_20140202