151114: bootstrap update
Merge branch 'dev_kay' of https://github.com/toka-htwg/ToKa_hotel-rating