new fields on station model
Merge branch 'api'