updated to common builder register
Merge branch 'rest' of github.com:sergiofbsilva/bennubone into rest

Conflicts:
	src/main/java/pt/ist/bennu/coffee/manager/adapter/CoffeeManagerJsonSerializer.java
	src/main/java/pt/ist/bennu/coffee/manager/rest/CoffeeManagerAbstractResource.java