人人登录
修改了底部导航栏关注我们小图片的对齐排列
修改了注册页面
修改了注册页面
完美地修改了首页滑块
添加页面尾部标签后台配置表
Merge branch 'refs/heads/kontem'
修改了首页滑块的速度
修改了文章页面下面登录
Merge branch 'refs/heads/kontem'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Index/daily.html
	aijianmei_back/apps/index/Tpl/default/Public/js/public.js
Merge branch 'refs/heads/kontem'
Merge branch 'refs/heads/kontem'

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

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Index/detail.html
	aijianmei_back/apps/index/Tpl/default/Public/js/public.js
修改创始人信息，修改底部标签右边导航条，使“公司简介”对齐其他标签
Merge branch 'Lock'

Conflicts:
	aijianmei_back/apps/admin/Lib/Action/GlobalAction.class.php
	aijianmei_back/apps/index/Tpl/default/Public/footer.html
Merge branch 'origin/master'
Merge branch 'refs/heads/kontem'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Index/daily.html
	aijianmei_back/apps/index/Tpl/default/Index/detail.html
	aijianmei_back/apps/index/Tpl/default/Train/video.html
fix 编码
bug fix
Merge branch 'refs/heads/master' into kontem