change
Merge branch 'master' of https://github.com/redheli/ethercat

Conflicts:
	etherlab_master/bin/etherlab_mastr