Merge pull request #27 from ridwannaruto/Ridwan

Bus Stops added to Routes Page
intermidiates correct one
Merge origin/master into dewmal
Merge pull request #28 from ridwannaruto/dewmal

Dewmal id changed
Check 1
Check 1