Update CameroomWCF
Merge branch 'master' of github.com:Ricozhet/CAMEROOM

Conflicts:
	CameRoomWeb/CameRoomWeb.v11.suo