added survey Class
conficts resolved
Merge branch 'master' of https://github.com/Check-That/REST-Service.git

Conflicts:

src/main/java/de/zeppelin/checkthat/webservice/Controllers/RestControlle
r.java