Merge branch 'master' into new_info_panel_inheritance
[situare] / doc /
drwxr-xr-x   ..
drwxr-xr-x - map
drwxr-xr-x - test_cases