bla
Merge branch 'master' of https://github.com/RSD2014-Group-5/FroboMind

Conflicts:
	fmApp/frobolab/frobit_v2_demo/launch/frobit_run_wpt_nav.launch