Fix #308 - Incremented displayed index for intermediate stops by one.
Fix #307 - Added condition to query for updated servers when location is desactivated and is requested.

Conflicts:
	opentripplanner-android/src/main/java/edu/usf/cutr/opentripplanner/android/fragments/MainFragment.java
Fix #325 - Corrected bike rental stations display, changing pojos (and adapting to them) and swapping coordinates.
Merge pull request #313 from vreixo/issue307

Fix #307 - Added condition to query for updated servers when location is desactivated and is requested.
Merge pull request #314 from vreixo/issue308

Fix #308 - Incremented displayed index for intermediate stops by one.
Merge pull request #316 from vreixo/issue315

Fix #315 - Corrected bike rental stations display, changing pojos (and a...
Fix #247 - Replaced button to plan trips by one which swaps origin and destination. Now when a destination or other specific parameters are set (like time) trip request is automatically triggered.
Fix #247 - Add "switch origin/destination" icon images
Merge pull request #319 from CUTR-at-USF/issue247-ReplaceTripPlanButton

Fix #247 - Replaced plan trip button with swap trips, auto-plan trip