Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	parkplan/src/main/java/com/byteflair/parkplan/api/LoginEndpoint.java
	parkplan/src/main/java/com/byteflair/parkplan/api/TrackEndpoint.java
	parkplan/src/main/java/com/byteflair/parkplan/api/domain/Pairing.java
	parkplan/src/main/java/com/byteflair/parkplan/api/domain/Track.java
	parkplan/src/main/java/com/byteflair/parkplan/api/domain/dto/TrackDTO.java
	parkplan/src/main/java/com/byteflair/parkplan/api/service/ITrackService.java
	parkplan/src/main/java/com/byteflair/parkplan/api/service/impl/TrackService.java
	parkplan/src/test/java/com/byteflair/parkplan/api/persistence/TrackDAOTest.java
	parkplan/src/test/java/com/byteflair/parkplan/api/service/impl/TrackServiceTest.java
	parkplan/src/test/resources/com/byteflair/parkplan/api/persistence/pairingDAOTest.xml
	parkplan/src/test/resources/com/byteflair/parkplan/api/persistence/trackDAOTest.xml
	parkplan/src/test/resources/com/byteflair/parkplan/api/service/impl/trackServiceTest.xml