Merge origin/master

Conflicts:
	src/java/ManageBeans/SessionMb.java
	src/java/ejbs/PlaylistFacade.java
Merge origin/master
Merge origin/master

Conflicts:
	src/java/ManageBeans/SessionMb.java
	src/java/ejbs/PlaylistFacade.java
Merge origin/master
Merge origin/master

Conflicts:
	src/java/ManageBeans/SessionMb.java
	src/java/ejbs/PlaylistFacade.java