Merge branch 'origin/master'

Conflicts:
	feature-persistence/pom.xml
	feature-persistence/src/main/resources/features.xml
	pom.xml
	rest/pom.xml
	tests/pom.xml
	tests/src/test/java/com.github.pires.example.tests/UserServiceIntegrationTest.java