part 4 - rest
Merge branch 'master' of https://github.com/rmpestano/tdc-poa

Conflicts:
	README.md
	pom.xml
	src/test/java/com/tdc/poa/integration/ConferenceIt.java