ws action getHerdIno
resolved conflict
Merge branch 'master' of https://github.com/Geodan/cow

Conflicts:
	src/cow.core.js