581: Merge pull request #336 from OneBusAway/develop

Release version 2.3 (iPhone 6 support + bug fixes)