Merge remote-tracking branch 'origin/master'

Conflicts:
	OksaMetalERPSon/OksaMetalERPSon.v11.suo

	OksaMetalERPSon/OksaMetalERPSon/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

bugrayapılan