commit
Merge branch 'master' of https://github.com/jasonfungsing/CouponMap

Conflicts:
	project.properties
	src/com/example/android/touroflondon/TourMapFragment.java