macro variant 2 implementation
new keywords
next
initial macro resolving
completion for macro
removed old macro code
Merge branch 'master' into macroVariant2
#elif
#else

parsing
Merge branch 'master' into macroVariant2
Merge branch 'macroVariant2'

Conflicts:
	dotnet-api/src/org/mustbe/consulo/dotnet/module/extension/DotNetModuleExtension.java
	dotnet-impl/src/org/mustbe/consulo/dotnet/module/extension/DotNetModuleExtensionImpl.java
fix compilation after merge