fixed navigation bug
Merge remote-tracking branch 'origin/master' into map_features
Merge pull request #15 from juancjara/map_features

Map features
Merge pull request #16 from juancjara/development

Merge pull request #14 from juancjara/master
add map to list view
finished map ui flow
Merge remote-tracking branch 'upstream/master' into map_features
Merge pull request #17 from juancjara/map_features

Map features
Merge pull request #18 from juancjara/master

update dev