merge
Merge branch 'gsr-sim-clock' of github.com:jhu-lcsr-forks/rtt_ros_integration into hydro-devel
bad merge
rtt_rosparam: Switching conversion error message to warning message
Merge branch 'gsr-sim-clock' of github.com:jhu-lcsr-forks/rtt_ros_integration into gsr-sim-clock
rtt_rosparam: Adding missing operations to requester
rtt_roscomm: Updating for new service interface
Merge branch 'hydro-devel' of github.com:jhu-lcsr-forks/rtt_ros_integration into hydro-devel
Merge branch 'hydro-devel' of github.com:orocos/rtt_ros_integration into hydro-devel
Merge branch 'hydro-devel' of github.com:jhu-lcsr-forks/rtt_ros_integration into hydro-devel
Numerous fixes to totally broken tf_interface.h
Merge branch 'hydro-devel' of github.com:orocos/rtt_ros_integration into hydro-devel
Merge branch 'hydro-devel' of github.com:jhu-lcsr-forks/rtt_ros_integration into hydro-devel
rtt_rosparam: Adding ability to get and set params with different names than their associated RTT properties.
rtt_rosparam: Updating readme for new api functions
rtt_rosdeployment: Interacting with a deployer via ROS service calls
rtt_rosclock: Clarifying walltime vs simtime clock access
Merge branch 'hydro-devel' of github.com:jhu-lcsr-forks/rtt_ros_integration into hydro-devel
Fixup before merge

rtt_rosclock: using long-long literals instead of floats in time
conversion
rtt_rosdeployment: using wrong license that snuk in
Merge remote-tracking branch 'jhu-lcsr-forks/hydro-devel' into hydro-devel

Conflicts:
	rtt_rosclock/src/rtt_rosclock.cpp