starting with goal 5
Merge branch 'master' of https://github.com/lohana/Hotelmania.git

Conflicts:
	Hotelmania/src/hotelmania/group3/platform/AgClient.java
Goal 5 finish but NOT tested.
Goal 4 finished
Problems with commit - every file is changed