comint
Tenho de comitar
Merge origin/master

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

Conflicts:
	src/java/pt/uc/dei/ar/proj5/grupob/entities/Administrator.java
	src/java/pt/uc/dei/ar/proj5/grupob/entities/Evaluation.java