# This is a combination of 5 commits.
# The first commit's message is:
Implemented FORGE-834
# The 2nd commit message will be skipped:

#	FORGE-834: Removed bogus RestGeneratedResources in javaee-impl and using the one in API

# The 3rd commit message will be skipped:

#	FORGE-836: Added relocation tag in parser-java and parser-java-api

# The 4th commit message will be skipped:

#	Implemented FORGE-842

# The 5th commit message will be skipped:

#	FORGE-835: Suport Lob fields in Forge
Implemented FORGE-862
Merge branch 'master' of http://github.com/forge/core into FORGE-862

Conflicts:
	maven-api/src/main/java/org/jboss/forge/maven/MavenPluginFacet.java
	project-model-maven-tests/src/test/java/org/jboss/forge/maven/facets/MavenPluginFacetManagedPluginTest.java
	project-model-maven/src/main/java/org/jboss/forge/maven/facets/MavenPluginFacetImpl.java
Merge branch 'FORGE-862' of http://github.com/salmon-charles/core into FORGE-862

Conflicts:
	maven-api/src/main/java/org/jboss/forge/maven/MavenPluginFacet.java
	project-model-maven-tests/src/test/java/org/jboss/forge/maven/facets/MavenPluginFacetManagedPluginTest.java
	project-model-maven/src/main/java/org/jboss/forge/maven/facets/MavenPluginFacetImpl.java