bankaservice
Merge branch 'remotedb' of github.com:mantic0/tehhotel into remotedb

Conflicts:
	TehHotel.Gui.TEst/Properties/Settings.Designer.cs
	TehHotel.Gui.TEst/Properties/Settings.settings
	TehHotel.Gui.TEst/TehHotel.Gui.Test.csproj
	TehHotel.Gui.TEst/Web.config
Merge branch 'remotedb' of github.com:mantic0/tehhotel into remotedb

Conflicts:
	TehHotel.Gui.TEst/Properties/Settings.Designer.cs
	TehHotel.Gui.TEst/Properties/Settings.settings
	TehHotel.Gui.TEst/TehHotel.Gui.Test.csproj
	TehHotel.Gui.TEst/Web.config
Merge branch 'remotedb' into hosted

Conflicts:
	TehHotel.Gui.TEst/TehHotel.Gui.Test.csproj
	TehHotel.Gui.TEst/Web References/RezervacijaService/RezervacijaService.wsdl
	TehHotel.Gui.TEst/Web References/RezervacijaService/RezervacijaService0.xsd