no message
Merge branch 'master' of https://github.com/quxiz/ebid

Conflicts:
	src/main/webapp/WEB-INF/views/registerItemView.jsp
no message