Merge origin/master

Conflicts:
	src/java/pt/uc/dei/paj/projeto4/grupoi/entidades/OrderReceived.java
Merge origin/master

Conflicts:
	web/index.xhtml