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
OS X linking
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
	Switched strands_datacentre to ros_datacentre in here
Merge pull request #65 from hawesie/master

	Switched strands_datacentre to ros_datacentre in here