merged and cleaned up
Merge branch 'master' of https://github.com/mplushnikov/lombok-intellij-plugin
merged and cleaned up