Merge origin/master

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

This reverts commit 2d4e369a87f3461a0bac5ba37bf0845d62d3a078.
Revert "Revert "Merge origin/master""

This reverts commit 28ee945107d04423e968598564aee5838153cf24.
Merge origin/master