Better color parsing, cleaned up code
Merge branch 'new' of https://github.com/juliawong/android-maps-utils into new