Fixed Foo.super.method() call when done from within a trait
GROOVY-6645
Introduce @ForceOverride to enforce trait composition in case a method already exists (necessary for mixin-like behavior)
Allow @ForceOverride at the trait level
Fix @Delegate after refactoring of copyAnnotations
refactor some utility methods to a more logical place
Fix SAM type coercion of traits
Make sure we can use methodMissing/propertyMissing in traits
Fix duplicate error message with @ForceOverride
Fixed private field name conflict in traits
Allow private (but not protected) methods in traits
Added test cases for private methods in traits
Make sure trait ordering follows the same behavior as with categories
Merge branch 'master' into traits-implementation

Conflicts:
	src/main/org/codehaus/groovy/transform/AbstractASTTransformation.java
	src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java
Fix SAM trait coercion with invokedynamic runtime
GROOVY-6646: let method with misfit vargs parameter be ignored
GROOVY-6641: ensure protocol does not show up in generated script class name
Documentation for traits (WIP)
Allow 'trait' to appear in package names and fully qualified class names in general
Let Groovy Console syntax highlight the trait keyword