moved stops to geostops
sorted correctly stoptimes
Merge branch 'devel' of https://github.com/smartcampuslab/scwp.apps into devel