Check-in Check-out
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/FrbaHotel.suo
	src/FrbaHotel/obj/Release/FrbaHotel.csproj.GenerateResource.Cache