Finish merge
Station data
Merge remote-tracking branch 'github/master'

Conflicts:
	Gemfile
	Gemfile.lock