Merge branch 'master' of https://github.com/ziguri/tecnoapi

Conflicts:
	src/java/pt/uc/dei/paj/projeto4/grupoi/entidades/Product.java
Merge branch 'master' of https://github.com/ziguri/tecnoapi