increase version of wps-config dependency
Merge remote-tracking branch 'upstream/master' into update-wps-config
Merge remote-tracking branch 'upstream/master' into update-wps-config
remove cloud hack, format
add missing junit depedency for tests, was transitively imported by old wps-config
remove usage of commons.lang method
Merge branch 'master' into update-wps-config

Conflicts:
	NOTICE
update notice file
Merge branch 'master' into update-wps-config

Conflicts:
	52n-wps-server/src/main/java/org/n52/wps/server/CapabilitiesConfiguration.java
Added new example request, cleaned up...

... test.html
Merge pull request #113 from bpross-52n/clean-up-requests

Added new example request, cleaned up test.html
Merge pull request #111 from nuest/update-wps-config

Update wps config
Updated licenses for ogckml2.2 and gmlpacket-2.0
Merge pull request #114 from bpross-52n/clean-up-license-mappings

Updated licenses for ogckml2.2 and gmlpacket-2.0
This fixes #115
Merge pull request #116 from bpross-52n/issue-115-WPS4R-image-rendering

This fixes #115