Merge branch 'safemerge'

Conflicts:
	.idea/misc.xml
	lombok-plugin/lombok-plugin.iml
	lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/extension/LombokHighlightErrorFilter.java
	lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/provider/LombokAugmentProvider.java
	lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/settings/ProjectSettingsPage.form
	lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/settings/ProjectSettingsPage.java
	lombok-plugin/src/main/resources/META-INF/plugin.xml
	pom.xml