Added Spain Railway Stations
Solved conflict manually
Merge branch 'vktrsm-master'