#95 - master - add keywords decoder
Conflicts:
	src/main/java/it/geosolutions/geoserver/rest/decoder/RESTResource.java
#95 - add ResourceEncoderTest
Conflicts:
	src/test/java/it/geosolutions/geoserver/decoder/MetadataDecoderTest.java
	src/test/resources/testdata/coverageExample.xml
fix inheritance for RESTFeatureTyle getAttribute methods

Conflicts:
	src/main/java/it/geosolutions/geoserver/rest/decoder/RESTFeatureType.java
	src/main/java/it/geosolutions/geoserver/rest/decoder/RESTResource.java
RESTLayer: provide workspace info in default style. Close #100.

Conflicts:
	src/main/java/it/geosolutions/geoserver/rest/decoder/RESTLayer.java
FeatureTypeList included
#102 master - encoder for AuthorityURL/Identifier/advertised (GS>=2.2)
Conflicts:
	src/main/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoder.java
	src/test/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoderTest.java
	src/test/java/it/geosolutions/geoserver/rest/encoder/feature/GSFeatureEncoderTest.java
#102 master - specific encoders in GSLayer for GS=2.1
#102-AuthorityURL/Identifier/advertised decoders +fix/add other methods
#102 master update RESTLayer javadoc
#102 master - fix GSLayerEncoder21Test
#102 master - improve GSLayerEncoder21 tests
#102 master - add decoders for GS 2.1 + tests
close #105. add getVersion capabilities

Conflicts:

	src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTReader.java

Conflicts:
	src/main/java/it/geosolutions/geoserver/rest/encoder/utils/XmlElement.java
	src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java
close #105. add getVersion capabilities

Conflicts:

	src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTReader.java

Conflicts:
	src/main/java/it/geosolutions/geoserver/rest/encoder/utils/XmlElement.java
	src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java
fix commit for #105. add integration tests
#102 - make tests based on GeoserverRESTTest VERSION
#106 master - fix tests to use GSVersionEncoder
close 110. IllegalArgument on getVersion on Geoserver 2.1
#102 master - fix tests
#102 master - fixh GeoserverRESTReader to handle versioned RESTLayer