Merge branch '750-integrate-new-ui-tk' into develop
Merge branch 'develop' of https://github.com/tckeelin/RideShare into develop
fixing develop... again.