Merge branch 'master' of https://github.com/strands-project/scitos_apps
Merge branch 'master' of https://github.com/strands-project/scitos_apps
Linking changes for OSX
Merge branch 'master' of https://github.com/strands-project/scitos_apps
Renamed directory to reflect package name and fixed launch file which contained
the wrong package name.
Binray did not match actual binary name.
Merge pull request #60 from cdondrup/master

Renamed directory and fixed launch file
added dependency for datacentre
Should fix the dependency problem for the data_centre
add joy as dependency
Merge branch 'master' of https://github.com/hawesie/scitos_apps
Merge pull request #50 from hawesie/master

Linking changes for OSX
Merge pull request #58 from hawesie/master

Extra linking necessary for OS X
Merge branch 'master' of https://github.com/strands-project/scitos_apps
Merge pull request #64 from BFALacerda/master

add joy dependency to scitos_teleop