Camera/map

Merged GICQUEL Gwenael requested to merge Camera/Map into master

Merge request reports