Added google colors, changed the way we draw polygons
Merge conflict in PopUp.java fixed