changes
changes
Merge branch 'dev_internal1' of
github:ddewaele/GoogleMapsV2WithActionBarSherlock into dev_internal1

Conflicts:
	GoogleMapsV2WithActionBarSherlock/project.properties
	GoogleMapsV2WithActionBarSherlock/src/com/ecs/google/maps/v2/fragment/PlayingWithMarkersFragment.java