Working in progress
Merge origin/master

Conflicts:
	src/main/java/it/panks/customerepo/service/CustomerService.java