修复点击右边导航栏后顶端出现空白区的问题
Merge branch 'Lock'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Index/contact.html
Merge branch 'refs/heads/kontem'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Index/ad.html
注释掉注册页面右侧导航栏爱健美人气信息
Merge branch 'Lock'
Merge branch 'origin/master'
Merge branch 'refs/heads/kontem'
Merge remote-tracking branch 'refs/remotes/origin/master'
首页添加了最新文章，，最新视频，，注册页面添加了一个勾
Merge branch 'refs/heads/kontem'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Index/register.html
fix
bug fix
导航 大类取消连接
fix a word
修复账号-个人资料页面的账号下拉样式
Merge branch 'Lock'
删除评论后头像旁的关注选项
Merge branch 'Lock'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Train/video.html
fix a bug (article - like/unlike)
bug fix