Temporary commit for pull
Merge branch 'master' into schunk-work

Conflicts:
	schunk_workspace/build/catkin_make.cache
Working on API node