Merge origin/master

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

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

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

Conflicts:
	src/main/java/controller/Controller.java
	src/main/java/model/DAO/PlayersDAO.java
	src/main/java/view/AddPlayerBean.java
	src/main/java/view/ClubListBean.java
	src/main/java/view/MoveTextBean.java
	src/main/java/view/PlayerBean.java
	src/main/java/view/TransferBean.java
	src/main/webapp/addPlayerView.xhtml