Xss zastita
Merge remote-tracking branch 'origin/Trollo' into Trollo

Conflicts:
	Trollo/Trollo.v11.suo
	Trollo/Trollo/bin/Trollo.dll
	Trollo/Trollo/bin/Trollo.pdb
	Trollo/Trollo/bin/bs/Trollo.resources.dll
	Trollo/Trollo/obj/Debug/Trollo.csproj.FileListAbsolute.txt
	Trollo/Trollo/obj/Debug/Trollo.csproj.GenerateResource.Cache
	Trollo/Trollo/obj/Debug/Trollo.csprojResolveAssemblyReference.cache
	Trollo/Trollo/obj/Debug/Trollo.dll
	Trollo/Trollo/obj/Debug/Trollo.pdb
	Trollo/Trollo/obj/Debug/bs/Trollo.resources.dll