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

Conflicts:
	CameRoomWCF/App_Code/IService.cs
	CameRoomWeb/CameRoomWeb.v11.suo
	CameRoomWeb/CameRoomWeb/CameRoomWeb.csproj
	CameRoomWeb/CameRoomWeb/Service References/CameRoomService/Reference.cs
	CameRoomWeb/CameRoomWeb/Service References/CameRoomService/Service.wsdl
	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/DesignTimeResolveAssemblyReferencesInput.cache
	CameRoomWeb/CameRoomWeb/obj/Debug/TempPE/Service References.CameRoomService.Reference.cs.dll