Added units in the favorite stations view.
Merge branch 'Add-New-Icons' into Integrate_Graph_View
Merge branch 'master' of github.com:RyanMaciel/oos-mobile

Fixed git issues.