metrics-ws modified to use the project gbif-microservice
missing dependency: gbif-common, required to load properties files
webapp dir added to the output jar
Merge branch 'master' into jetty

Conflicts:
	pom.xml
merging head