Merge pull request #1 from pirobot/master

Fixed fake local_cost_params.yaml static_map param should be false inste...
Reverted fake local_costmap_params.yaml to previous version as we need a static map in fake mode
Merge pull request #2 from pirobot/groovy-devel

Merging latest groovy-devel with master branch
Fix a bug in video looping in video2ros.py
Merge branch 'master' of https://github.com/jaehak/rbx1 into indigo-devel

Conflicts:
	rbx1_nav/config/fake/local_costmap_params.yaml