Changed version number
Merge remote-tracking branch 'Github/master'
Made adjustments to stations tab