Project broken test
Merge branch 'master' of https://github.com/kostyuchenkovyacheslav/Herd

Conflicts:
	Herd/Herd.userprefs
	Herd/Herd/LocalDeviceHandler.cs