Timeframes & Photos
Commit to merge
Merge branch 'master' of https://github.com/rob-med/AndroidSRO

Conflicts:
	AndroidManifest.xml
	res/layout/activity_place_details.xml
	res/values/strings.xml
	src/com/sro/activity/CustomOverlayItem.java
	src/com/sro/activity/MyGeolocationMap.java
	src/com/sro/activity/PlaceDetailsActivity.java
	src/com/sro/activity/RouteActivity.java
	src/com/sro/activity/SearchPlaceActivity.java
	src/com/sro/model/Event.java
	src/com/sro/model/Place.java
	src/com/sro/util/MapInfo.java