Modified colors. Fixed 2 bugs in Google map fragment.
Merge branch 'Ossi_dev'