[MM] - other..
Merge branch 'dropbox' into maps
Merge branch 'dropbox' into maps
[MM,PS]{extending test functions} - Testing extended map activity
[MM,PS]{extending test functions} - testing map settings