add common/graphics/osg_lines into libs.autobuild
Merge pull request #1 from annaborn/libs.autobuild

add common/graphics/osg_lines into libs.autobuild
added urdf_loader
added urdf_loader
Merge pull request #3 from jakobs/master

added urdf_loader
Changed the mars and mars_core package to the same repository,
changed the mars_core package to a fixes depricated-naming branch.
Merge remote-tracking branch 'autobuild/master' into stable_and_release

Conflicts:
	libs.autobuild
Fixed branch selection for mars for rock-flavors != master
Merge remote-tracking branch 'autobuild/master' into stable_and_release
Merge pull request #4 from jakobs/stable_and_release

Stable and release