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