Merge commit 'origin/ramosam' into wallika-tabbar
[situare] / tests /
drwxr-xr-x   ..
drwxr-xr-x - testMap
drwxr-xr-x - testUI