Merge pull request #14 from juancjara/master

update dev
Merge pull request #15 from juancjara/map_features

Map features
Merge pull request #16 from juancjara/development

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