Fix #264 - Added functions to fallback to different solutions if routeShortName is not present.
Merge branch 'master' of https://github.com/CUTR-at-USF/OpenTripPlanner-for-Android into issue264

Conflicts:
	opentripplanner-android/src/main/java/edu/usf/cutr/opentripplanner/android/fragments/MainFragment.java
Update integers.xml

There was an unintentional change from recording the video in default padding.
Merge pull request #265 from vreixo/issue264

Fix #264 - Added functions to fallback to different solutions if routeShortName is not present.
Update to #259 - Full Android support on Travis CI.
Update to #259 - Apparently we will need "TERM-dumb" for only the assembleDebug build task to run (i.e., without assembleRelease being run also)
Update to #259 - Will this force only assembleDebug to run?
Update to #259 - Re-add "install".
Update to #259 - Reformat, add more documentation in comments.
Merge pull request #266 from CUTR-at-USF/issue259-NewTravisCIScript

Update to #259 - Full Android support on Travis CI.
Update to #259 - Improve build server performance by allowing disabling of pre-dexing (see http://tools.android.com/tech-docs/new-build-system/tips#TOC-Improving-Build-Server-performance.)
Merge pull request #267 from CUTR-at-USF/issue259-OptimizeBuildServer

Update to #259 - Improve build server performance by allowing disabling ...
Fix #268 - Removed call to getResources() mistaken in route name on main spinner.
Merge pull request #269 from vreixo/issue268

Fix #268 - Removed call to getResources() mistaken in route name on main...
Fix #270 - Added xxhdpi specific values for zoom padding.
Merge pull request #271 from vreixo/issue270

Fix #270 - Added xxhdpi specific values for zoom padding.
Update to #259 - Remove no-op for install stage, since per https://github.com/travis-ci/travis-ci/issues/1395#issuecomment-42520643 the new default Travis behavior is to not execute any install stage.
Merge pull request #272 from CUTR-at-USF/issue259-TravisScriptUpdate2

Update to #259 - Remove no-op for install stage, since per https://githu...
Bump version number to prepare for release.
Update to #259 - Remove 'TERM=dumb` command, since per https://github.com/travis-ci/travis-ci/issues/2275 it is now included by default.