ShowPlaceActivity versneld
Merge branch 'master' of https://github.com/NotEvenEntertaining/Museapp

Conflicts:
	src/com/example/androidhive/ShowPlaceActivity.java