fixed approach pose
enabled movie
added tray controller reset
Merge branch 'master' of https://github.com/ipa-josh/ipa_lcrob

Conflicts:
	mobina_states/ros/src/ms_wissenschaft.py
still tray
fixed approach pose