commit
Merge branch 'master' of https://github.com/lovelease/helloandroid.git

Conflicts:
	src/com/example/helloandroid/GoogleMapActivity.java