Created orphaned branch upstream
Imported upstream version '0.3.0' of 'upstream'
Rebase from 'upstream' (no changes)
Rebase from 'upstream'
Added support for namespaced frame_ids. Added SetOrigin service to manipulate publish map origin
Pushing changes
Merge branch 'hydro-devel' of https://github.com/MohitShridhar/map_store into HEAD

Conflicts:
	CMakeLists.txt
	package.xml
	src/map_manager.cpp
	src/map_saver.cpp