Should we delete this?
Merge branch 'master' of https://github.com/mstana/pa165

Conflicts:
	pa165_booking_manager_web/target/classes/cz/muni/fi/pa165/bookingmanager/controllers/HelloController.class