asd
Merge branch 'master' of https://github.com/zsolt-halo/FleetRegistry

Conflicts:
	BACKEND/asd/.classpath
	BACKEND/asd/src/main/java/ApacheHttpClientGet.java
	BACKEND/asd/target/classes/ApacheHttpClientGet.class
	BACKEND/asd/target/m2e-wtp/web-resources/META-INF/maven/asd/asd/pom.properties