Changes made by Todor Yanev (yanev.tm@gmail.com).
Merge branch 'master' of https://github.com/2She2/RideWithUs.git