REQ 8.
Merge origin/master

Conflicts:
	src/java/pt/acertarorumo/tecno/services/CustomerService.java
Merge origin/master

Conflicts:
	src/java/pt/acertarorumo/tecno/services/CustomerService.java