Merge origin/develop into develop

Conflicts:
	pom.xml
	src/main/java/org/dyndns/soundi/communicationaction/browser/Requests.java
	src/main/java/org/dyndns/soundi/communicationaction/core/Requests.java
	src/main/java/org/dyndns/soundi/communicationaction/core/Responses.java
	src/main/java/org/dyndns/soundi/communicationaction/downloader/Requests.java
	src/main/java/org/dyndns/soundi/communicationaction/player/Requests.java
	src/main/java/org/dyndns/soundi/communicationaction/playerengine/Requests.java
	src/main/java/org/dyndns/soundi/communicationaction/playerengine/Responses.java
	src/main/java/org/dyndns/soundi/communicationaction/portals/Responses.java
	src/main/java/org/dyndns/soundi/communicationaction/unspec/Responses.java
	src/main/java/org/dyndns/soundi/portals/interfaces/License.java
	src/main/java/org/dyndns/soundi/portals/interfaces/State.java
	src/main/java/org/dyndns/soundi/utils/Proxy.java
	src/main/java/org/dyndns/soundi/utils/WebClientDevWrapper.java