Merge origin/master

Conflicts:
	src/main/java/view/PreaprovalBean.java
	src/main/webapp/clubView.xhtml