Merge origin/master

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