Merge origin/master

Conflicts:
	src/java/ManageBeans/LoggedUserMb.java
	src/java/ManageBeans/SearchMb.java
Merge origin/master