修改外链直接访问跳转到登陆页的问题
提交迷你云1.6版本代码
Merge remote-tracking branch 'origin/master'
1、支持微信扫描二维码方式登陆
2、支持微信中直接访问迷你云的文件
3、微信版迷你云可在iPhone版在线浏览
4、微信版迷你云可分享给好友与朋友圈
Merge remote-tracking branch 'remotes/origin/miniyun_1.7'

Conflicts:
	protected/cache/model/MiniUser.php
	protected/utils/CUtils.php
merge code
merge code
merge code
merge code
merge code
merge code
merge code
支持电子邮件为空的情况
Merge branch 'master' into miniyun_0927

Conflicts:
	protected/lianyu/biz/PrivilegeBiz.php
	protected/lianyu/service/PrivilegeService.php
Merge branch 'master' into miniyun_0927

Conflicts:
	protected/lianyu/biz/PrivilegeBiz.php
	protected/lianyu/service/PrivilegeService.php
Merge remote-tracking branch 'origin/miniyun_0927' into miniyun_0927