Priprava resetu
Merge remote-tracking branch 'origin/devbranch' into devbranch

Conflicts:
	Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache