Conflicts:
	.gitignore
	jaxrs-to-raml/com.mulesoft.jaxrs.raml.generator.annotations/pom.xml
	pom.xml
	raml-to-jaxrs/core/pom.xml
	raml-to-jaxrs/eclipse-plugin/pom.xml
	raml-to-jaxrs/examples/jersey-example/pom.xml
	raml-to-jaxrs/examples/jersey-example/src/main/java/org/raml/jaxrs/example/impl/PresentationResource.java
	raml-to-jaxrs/maven-plugin/pom.xml
	raml-to-jaxrs/pom.xml