Merged/Bug Fixes

Fixed Stops Table View/ Map. Fixed view when rotating device. Added
stop number to be displayed in stop table view.