Merge pull request #1 from raghav1987/App_Helper_Redo

Re-implement changes in the AppHelper
add map to show page
remove station spec test
fix merge conflicts
Merge pull request #2 from DineshRai/render_map_on_show

add map to show page
Merge branch 'master' into App_Helper_Redo