Merge pull request #2 from PerfCake/devel

Devel
finally solved problem with intellij dependencies
fixed bug: accidently removed line in previous changes
a bit of refactoring
fixed bug with Icons