Commit to merge
git sta impazzendo
Merge branch 'master' of https://github.com/rob-med/AndroidSRO

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/sro/activity/PlaceDetailsActivity.java