Test issue #25 of Sando.
Merge branch 'master' into topic-incrementalupdate
Fixed several issues.
Merge branch 'topic-incrementalupdate' of github.com:abb-iss/SrcML.NET into topic-incrementalupdate

Conflicts:
	ABB.SrcML.Test/ShortXmlFileNameMappingTests.cs
	VisualStudio/ABB.SrcML.VisualStudio.SrcMLService/ABB.SrcML.VisualStudio.SrcMLService.csproj