Changed the style of account page and login page.
调整商店
Merge remote-tracking branch 'refs/remotes/origin/MianBranch'

Conflicts:
	aijianmei_back/shop/temp/caches/f/index_40F756F0.php
	aijianmei_back/shop/temp/compiled/group_buy.lbi.php
	aijianmei_back/shop/temp/compiled/recommend_hot.lbi.php
	aijianmei_back/shop/temp/compiled/recommend_new.lbi.php
fix
fix
add
fix
Merge remote-tracking branch 'refs/remotes/origin/MianBranch'
Merge branch 'refs/heads/Annbranch'
fix
Merge remote-tracking branch 'refs/remotes/origin/MianBranch'

Conflicts:
	aijianmei_back/shop/themes/default/library/page_header.lbi
gjhmgujh
fix
fix
Changed ,, account.css and login.css
Merge branch 'refs/heads/Annbranch'
Merge remote-tracking branch 'refs/remotes/origin/master'