store
store register
Merge branch 'refs/heads/Annbranch'
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	aijianmei_front/article.html
	aijianmei_front/js/public.js