respawn set to true
Merge remote-tracking branch 'upstream/hydro-devel' into hydro-devel

Conflicts:
	semantic_map/launch/mapping.launch
Merge pull request #25 from cburbridge/hydro-devel

respawn set to true