login page changed
Merge branch 'master' of https://github.com/wangwengcn/pighouse.git

Conflicts:
	WebContent/views/home.jsp