fixed overlap between Android and Sofia
Merge branch 'master' of https://github.com/tsmock/trip-cost-calculator.git