update CameRoom (add Booking)
Merge branch 'master' of github.com:Ricozhet/CAMEROOM

Conflicts:
	CameRoomWeb/CameRoomWeb.v11.suo
	CameRoomWeb/CameRoomWeb/Models/GrapherModel.cs
	CameRoomWeb/CameRoomWeb/bin/CameRoomWeb.dll
	CameRoomWeb/CameRoomWeb/bin/CameRoomWeb.pdb
	CameRoomWeb/CameRoomWeb/obj/Debug/CameRoomWeb.dll
	CameRoomWeb/CameRoomWeb/obj/Debug/CameRoomWeb.pdb
	CameRoomWeb/CameRoomWeb/obj/Debug/TempPE/Service References.CameRoomService.Reference.cs.dll