Merged to develop
Merge branch 'develop' of github.com:halirutan/Mathematica-IntelliJ-Plugin into develop

Conflicts:
	resources/META-INF/plugin.xml