merging master
Merge branch 'master' into jetty

Conflicts:
	pom.xml
	src/main/java/org/gbif/metrics/tile/guice/GuiceServletConfig.java