no message
Merge branch 'master' of https://github.com/impmja/auctionhouse

Conflicts:
	backend/Web/index.jsp
added header.jsp
Merge branch 'master' of https://github.com/impmja/auctionhouse