Merge branch 'vasilis' to master

Conflicts:
	HotelResSystem/src/client/main.java
	HotelResSystem/src/internal/Hotel.java
	HotelResSystem/src/internal/Reservation.java