Show enter icon
Changed some public style.
git changed the ignore file .
Added the user agreement. (agreement.html)
Merge remote-tracking branch 'refs/remotes/origin/AnnBranch'

Conflicts:
	aijianmei_front/css/public.css
Background picture
update back css files and Train Page
what
Merge remote-tracking branch 'refs/remotes/origin/master'
update Nutri Page
update Append Page
fix Trian index.html page bugs
fix Articledetial pager
Merge branch 'refs/heads/kontem'
Merge branch 'refs/heads/master' into kontem
Merge branch 'refs/heads/master' into kontem
修复视频上传问题