changes
Merge branch 'master' of https://github.com/demien666/java_repository

Conflicts:
	blog/02 cxf_rest/pom.xml