parameter regulation
sdh fake pub adjusted
tray_fake_pub available
Merge branch 'master' of github.com:ipa-fmw-ws/cob_manipulation

Conflicts:
	cob_arm_navigation/src/tray_fake_pub.py