Stand 141114
Merge branch 'dev_kay' of https://github.com/toka-htwg/ToKa_hotel-rating
171114: dev_kay to master
Merge branch 'master' of https://github.com/toka-htwg/ToKa_hotel-rating
171114: dev_kay to master