Add Maarten's changes.
Merge branch 'hydro-devel' of github.com:robotica-minor1/hector_quadrotor into hydro-devel

Conflicts:
	hector_quadrotor_description/urdf/quadrotor_base.urdf.xacro