changes
Merge branch 'dev_track1' of git@github:ddewaele/PlayServicesSample.git
into dev_track1

Conflicts:
	src/com/example/simplemapproject/Constants.java