Merge branch 'Stations' into Developer
Fixed the filter and vcxproj file
Merge branch 'Developer' into Stations