initial
Merge branch 'inheritLineMarker'

Conflicts:
	csharp-psi-impl/src/org/mustbe/consulo/csharp/lang/psi/impl/source/CSharpTypeDeclarationImpl.java
	csharp-psi-impl/src/org/mustbe/consulo/csharp/lang/psi/impl/source/CSharpTypeListImpl.java
	dotnet-psi-api/src/org/mustbe/consulo/dotnet/psi/DotNetTypeList.java
	resources/META-INF/CSharp.xml