Merge origin/master

Conflicts:
	src/java/pt/uc/dei/ipj/grupoa/facades/UserPlayFacade.java
Merge origin/master