Merge pull request #7 from juancjara/map_features

Map features ggwp
Merge pull request #8 from juancjara/master

update dev
back button
fixed conflicts
Merge pull request #9 from juancjara/development

Development
new images
tabs route data
Merge pull request #10 from juancjara/development

Development
icon bigger, new maps , new route, new bugs
Merge pull request #11 from juancjara/development

icon bigger, new maps , new route, new bugs
Merge remote-tracking branch 'upstream/master' into map_features