тест1
Версия от 17.07.14
Merge remote-tracking branch 'origin/получение_версии'

Conflicts:
	API/API/API.cs
	API/API/Properties/AssemblyInfo.cs
	API/API/bin/Release/API.dll
	API/API/bin/Release/API.pdb
	API/API/obj/Release/API.dll
	API/API/obj/Release/API.pdb
	API/API/obj/Release/DesignTimeResolveAssemblyReferences.cache
	API/API/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache