Database and REST server improvements
Merge branch 'master' of https://github.com/MichalTuleja/cloud-project

Merge.
Database schema cleanup