added call to xacro
fixed srdf path overwrite
Merge remote-tracking branch 'ros-planning/groovy-devel' into groovy-devel

Conflicts:
	src/widgets/configuration_files_widget.cpp (solved)
fixed srdf path overwrite after merge
Merge pull request #34 from ipa-mdl/groovy-devel

Groovy devel