Merge origin/master

Conflicts:
	src/java/ManageBeans/LoggedUserEjb.java
	src/java/ManageBeans/SessionMb.java
Merge origin/master