Merge pull request #53 from rctoris/stable

r7 release
Fixed else matching to wrong if in building urdf scene
Added check for no material tag in urdf
Merge pull request #63 from mitchellwills/devel

Fixed else matching to wrong if in building urdf scene
use the total length of zoomDelta, not just the y component, for multi-touch zooming

this means the 'pinch' gesture can be oriented any way the user desires (in fact, pinching along the x axis is the more natural variant) and still yield the desired result
fix typo in description of onMouseMove()
Merge pull request #64 from T045T/devel

multi-touch zooming: consider movement along X and Y axis
Clean up
Merge conflicts fixed
adding THREE.ColladaLoader
rebuild
ubuntu 14.04 instructions added
added THREE.ColladaLoader
added flag to change the type of collada loader
updated to r6 of roslibjs
branches added to travis
Merge pull request #65 from rctoris/develop

Added flag for ColladaLoader type
Update .travis.yml
Update README.md
Update LICENSE
Update LICENSE