Merge pull request #21 from ros-planning/hydro-devel

Update to the ros-planning hydro-devel
updated the set of models in the config
Merge pull request #245 from bosch-ros-pkg/hydro-devel-amcl-small-fix

Hydro devel amcl small fix
map_server: remove vestigial export line

the removed line does not do anything in catkin
map_server: [style] alphabetize dependencies
Merge pull request #247 from ros-planning/fixup_map_server

Fixup map server
Merge remote-tracking branch 'upstream/hydro-devel' into global_planner_fix