check in tourist place branch
Merge branch 'master' into touristplace

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
commit tourist branch
Merge branch 'master' into touristplace
tourist
Merge branch 'master' into touristplace
tourist place items
- added restaurant item view
- added restaurant list array adapter
- adjusted restaurant services and models
tourist place implement items
implemented list of restaurants belong to a trip
Merge branch 'touristplace'

Conflicts:
	AndroidManifest.xml
	res/values/dimens.xml
resolved conflicted due to auto merge