merged
Merge branch 'master' of https://github.com/Check-That/REST-Service.git