Merge pull request #46 from rctoris/stable

r6 release
Merge pull request #47 from rctoris/devel

r7-devel started
3djs tries to start rotate...?
3djs can rotate/slide/pinch
Merge pull request #2 from KazutoMurase/work_on_tablet

3djs can rotate/slide/pinch
apply murase's change to src files
fix the initial position for move action
fix the scale of cylinder marker
fixed the bug of touch event of interactiver marker
Fixed a bug in inverting a transform in the interactive marker handle.
Merge pull request #48 from eratner/devel

Interactive markers transform fix
According to the ROS wiki (rviz/DisplayTypes/Marker sec. 1.3.11) for a mesh resource marker, if the color is set to anything other than r=0, g=0, b=0, a=0, the marker color and alpha will be used to tint the mesh, so this is now possible.
General code clean up.
Merge pull request #49 from eratner/devel

Colored mesh resource markers
delete some debug lines
merge conflict