test modif
Merge branch 'urdfgeneration' into commitUrdf

Conflicts:
	nao_description/scripts/generate_urdf.py
added generated xacro files