#328 new eclipse ide settings now split up into two files, because import seems to be bugy when both is mixed in one file
Merge remote-tracking branch 'origin/develop' into develop