Merged Entertainment and Hotel

Small fix in Hotel
Merge branch 'master' of https://github.com/lewinzki/bucephalus

Conflicts:
	bucephalus/src/se/sics/tac/aw/DummyAgent.java