login begin
fuck
Merge branch 'master' of https://github.com/happy-robot/EShop

Conflicts:
	EShop-war/build/web/index.html
	dist/gfdeploy/EShop/EShop-war_war/index.html