adaptive messages for scld_atp
Merge branch 'scl_atp_adm'

Conflicts:
	wiselib.testing/algorithms/neighbor_discovery/neighbor_discovery.h