separate startups for hardware and simulation
Sync git again
i
Merge branch 'master' of https://github.com/mockbot/MockBot

Conflicts:
	mockbot2/launch/stage_simulator.launch