Joining svn and git
Merge branch 'testing' of https://github.com/dantard/unizar-rt-wmp-ros-pkg into testing
Merge branch 'testing' of https://github.com/dantard/unizar-rt-wmp-ros-pkg into 64bit