Fix typo in documentation of traits
Document multiple inheritance of traits
ignore Eclipse files of groovy-nio subproject
fixed path to sources of groovy-templates subproject
Merge remote-tracking branch 'upstream/master' into builderTransform