Merge remote-tracking branch 'origin/master'

Conflicts:
	oxxo/oksametal/OxxoSolution/OxxoUserInterface/OxxoUserInterface.v11.suo

	oxxo/oksametal/OxxoSolution/OxxoUserInterface/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	oxxo/oksametal/OxxoSolution/OxxoUserInterface/obj/Debug/OxxoUserInterface.csproj.FileListAbsolute.txt

deniz hata