cxf
Merge branch 'master' of https://github.com/jalmeidaa/BookEngineRS.git

Conflicts:
	src/com/bookengine/ws/service/BookResource.java
Merge branch 'master' of https://github.com/jalmeidaa/BookEngineRS.git

Conflicts:
	src/com/bookengine/ws/service/cxf.xml
cfx