uncommented code which was commented for debugging
Merge remote-tracking branch 'remotes/origingithub/plugins' into developer
class names clashed
Merge branch 'developer' of https://github.com/nomacs/nomacs into developer