f
---
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/webschik/doT/DotHighlighter.java
	src/com/webschik/doT/DotIcons.java
	src/com/webschik/doT/DotTemplateHighlighter.java
	src/com/webschik/doT/config/DotConfig.java
	src/com/webschik/doT/config/DotFoldingOptionsProvider.java
	src/com/webschik/doT/editor/actions/DotEnterHandler.java
	src/com/webschik/doT/editor/actions/DotTypedHandler.java
	src/com/webschik/doT/editor/braces/DotBraceMatcher.java
	src/com/webschik/doT/editor/comments/DotCommenter.java
	src/com/webschik/doT/editor/folding/DotFoldingBuilder.java
	src/com/webschik/doT/file/DotFileType.java
	src/com/webschik/doT/file/DotFileViewProvider.java
	src/com/webschik/doT/format/DotFormattingModelBuilder.java
	src/com/webschik/doT/inspections/DotBlockMismatchFix.java
	src/com/webschik/doT/inspections/DotBlockMismatchInspection.java
	src/com/webschik/doT/pages/DotColorsPage.java
	src/com/webschik/doT/pages/DotConfigurationPage.java
	src/com/webschik/doT/parsing/DotCompositeElementType.java
	src/com/webschik/doT/parsing/DotElementType.java
	src/com/webschik/doT/parsing/DotParseDefinition.java
	src/com/webschik/doT/parsing/DotParsing.java
	src/com/webschik/doT/parsing/DotTokenTypes.java
	src/com/webschik/doT/parsing/_DotLexer.java
	src/com/webschik/doT/psi/DotPsiFile.java
	src/com/webschik/doT/psi/impl/DotBlockWrapperImpl.java
	src/com/webschik/doT/psi/impl/DotCommentImpl.java
	src/com/webschik/doT/psi/impl/DotDataImpl.java
	src/com/webschik/doT/psi/impl/DotParamImpl.java
	src/com/webschik/doT/psi/impl/DotPartialImpl.java
	src/com/webschik/doT/psi/impl/DotPartialNameImpl.java
	src/com/webschik/doT/psi/impl/DotPathImpl.java
	src/com/webschik/doT/psi/impl/DotPsiElementImpl.java
	src/com/webschik/doT/psi/impl/DotSimpleInverseImpl.java
	src/com/webschik/doT/psi/impl/DotStatementsImpl.java
	src/com/webschik/doT/structure/DotStructureViewFactory.java
	src/com/webschik/doT/structure/DotStructureViewModel.java
	src/com/webschik/doT/structure/DotTreeElement.java
	src/com/webschik/doT/structure/DotTreeElementFile.java
Merge remote-tracking branch 'origin/master'
refactor parser
refactor parser