Fix #252 - Updated old branch and solved conflicts.
Fix #252 - Corrections to previous merge.
Merge branch 'master' of https://github.com/CUTR-at-USF/OpenTripPlanner-for-Android into issue147
Fix #147 - Code refactor. Now updateSelectedServer is always called when there is a server change, this way actions to be triggered in that moment can be written in it.
Fix #147 - Moved back bus mode map icon to drawable.
Fix #147 - Added static bike rental support, availability values are displayed but not updated (just when retrieving stations, on app start or server change).
Fix #147 - Reverted test concept new UI mistakenly added in previous commits.
Fix #147 - Reduced words for bike rental infowindows to make them smaller.
Fix #147 - New UI including bike rental finished, now all trip options are saved on app exit and restored. Old API model was used, bike rental trips are not tested nor devices bellow v14. Relies on an updated and corrected version of pojos.
Fix #147 - Corrected UI management of optimization values changes according to selection of bike modes.
Fix #147 - Added JavaDoc to new or updated functions.
Fix #147 - Hidden transport modes on orientation portrait, because on most devices screen is way too small to show them correctly.
Fix #147 - Updated ldpi layouts.
Fix #147 - Moved bus icon to drawable-hdpi.
Fix #147 - Added periodic updates to bike rental stations.
Fix #147 - Code refactor. Now updateSelectedServer is always called when there is a server change, this way actions to be triggered in that moment can be written in it.

Fix #147 - Moved back bus mode map icon to drawable.

Fix #147 - Added static bike rental support, availability values are displayed but not updated (just when retrieving stations, on app start or server change).

Fix #147 - Reverted test concept new UI mistakenly added in previous commits.

Fix #147 - Reduced words for bike rental infowindows to make them smaller.

Fix #147 - New UI including bike rental finished, now all trip options are saved on app exit and restored. Old API model was used, bike rental trips are not tested nor devices bellow v14. Relies on an updated and corrected version of pojos.

Fix #147 - Corrected UI management of optimization values changes according to selection of bike modes.

Fix #147 - Added JavaDoc to new or updated functions.

Fix #147 - Hidden transport modes on orientation portrait, because on most devices screen is way too small to show them correctly.

Fix #147 - Updated ldpi layouts.

Fix #147 - Moved bus icon to drawable-hdpi.

Fix #147 - Added periodic updates to bike rental stations.
Merge branch 'master' of https://github.com/CUTR-at-USF/OpenTripPlanner-for-Android into issue147
Fix #147 - Added ferry mode.
Merge branch 'issue147' of https://github.com/vreixo/OpenTripPlanner-for-Android into issue147

Conflicts:
	opentripplanner-android/src/main/java/edu/usf/cutr/opentripplanner/android/fragments/MainFragment.java
	opentripplanner-android/src/main/res/layout-ldpi-v14/main.xml
	opentripplanner-android/src/main/res/layout-ldpi/main.xml
	opentripplanner-android/src/main/res/layout-v14/main.xml
	opentripplanner-android/src/main/res/layout/main.xml
Fix #147 - Completed ferry mode.