commit to merge
Merge branch 'master' of https://github.com/rob-med/AndroidSRO

Conflicts:
	res/layout/activity_place_details.xml