Next step for stations list
Merge branch 'master' into js