Merge of RestAPI with dev branch

from develop: git checkout SUN-1696-Feature

git checkout -p Release_SUN-1696-2 -- src/main/java/com/sunwave/rest/

git checkout -p Release_SUN-1696-2 -- src/test/java/com/sunwave/rest/

git checkout -p Release_SUN-1696-2 -- pom.xml