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
Merge origin/master