cleanup
Merge branch 'master' of git@github.com:ddewaele/GoogleMapsV2WithActionBarSherlock.git