Merge origin/master

Conflicts:
	src/main/java/mum/auction/controller/UserBean.java
things
Conflicts resolved
:Merge origin/master

Conflicts:
	src/main/java/mum/auction/controller/AuctionBean.java
	src/main/java/mum/auction/controller/BookBean.java
	src/main/webapp/addAuction.xhtml