[configuration] Merge branch 'master' as we work on configuration.

* Conflict due to adding topic() feature to logger in master, and 'field name' feature in config branch.
* master has since updated to shiny new eclipse dep versions and the 'ant eclipseForDebugging' feature, but this branch added deps. Addressed that.
* Renamed 'loggerCategory' to 'loggerTopic'. I know, that wasn't exactly right to do in a merge, but, there you have it.
* Test infrastructure changed in configuration branch, and tests had been added in master branch.

Conflicts:
	build.xml
	buildScripts/ivy.xml
	src/core/lombok/eclipse/handlers/HandleLog.java
	src/core/lombok/extern/apachecommons/CommonsLog.java
	src/core/lombok/extern/java/Log.java
	src/core/lombok/extern/log4j/Log4j.java
	src/core/lombok/extern/log4j/Log4j2.java
	src/core/lombok/javac/handlers/HandleLog.java
	test/transform/resource/after-ecj/ValInTryWithResources.java

1 files changed, 2 insertions, 2 deletions

diff --git a/usage_examples/EqualsAndHashCodeExample_post.jpage b/usage_examples/EqualsAndHashCodeExample_post.jpage
index 4a90e7dc..aa6a44ba 100644
--- a/usage_examples/EqualsAndHashCodeExample_post.jpage
+++ b/usage_examples/EqualsAndHashCodeExample_post.jpage
@@ -24,7 +24,7 @@ public class EqualsAndHashCodeExample {
 	}
 	
 	@Override public int hashCode() {
-		final int PRIME = 31;
+		final int PRIME = 59;
 		int result = 1;
 		final long temp1 = Double.doubleToLongBits(this.score);
 		result = (result*PRIME) + (this.name == null ? 0 : this.name.hashCode());
@@ -57,7 +57,7 @@ public class EqualsAndHashCodeExample {
 		}
 		
 		@Override public int hashCode() {
-			final int PRIME = 31;
+			final int PRIME = 59;
 			int result = 1;
 			result = (result*PRIME) + super.hashCode();
 			result = (result*PRIME) + this.width;