change
Merge branch 'master' of https://github.com/robin521111/InforwebMvc4

Conflicts:
	WebSite/Consumer.htm
add Consumer_baobo.htm and Consumer_gela.htm