commit touristplace
Merge branch 'master' into tourist_place

Conflicts:
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar
tourist place detail
deleted gen, bin folders and .classpath file
Merge branch 'tourist_place'
resolved conflict