全局话题标签调整, 上传附件权限bugfix
Merge branch 'develop' of https://bitbucket.org/wecenter/wecenter into develop
fix
Merge branch 'develop' of ssh://bitbucket.org/wecenter/wecenter into develop
Merge branch 'develop'
用户小卡片调整, 手机版icon调整
我关注的话题页面整合到动态页面
bugfix
Merge branch 'develop' of https://bitbucket.org/wecenter/wecenter into develop

Conflicts:
	views/default/article/index.tpl.htm
邮箱验证提示, bugfix
Merge branch 'develop' of https://bitbucket.org/wecenter/wecenter into develop
邮箱验证提示
bugfix
Merge branch 'develop' of https://bitbucket.org/wecenter/wecenter into develop
bugfix
Merge branch 'develop' of https://bitbucket.org/wecenter/wecenter into develop
邮箱验证提示
编辑器按键提示兼容mac
Merge branch 'develop'
040912