Merge origin/master

Conflicts:
	src/Hotel/AppUser.java
	src/Hotel/RoomType.java