Merge branch 'master' into jdk8. Also added some major fixes whilst merging.

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java
	src/utils/lombok/javac/CommentCatcher.java
	src/utils/lombok/javac/Javac.java

1 files changed, 24 insertions, 0 deletions

diff --git a/test/transform/resource/after-delombok/JavadocGenerally.java b/test/transform/resource/after-delombok/JavadocGenerally.java
new file mode 100644
index 00000000..729cdce3
--- /dev/null
+++ b/test/transform/resource/after-delombok/JavadocGenerally.java
@@ -0,0 +1,24 @@
+/**
+ * Doc on package
+ */
+package testPackage;
+/** Weird doc */
+/**
+ * Doc on class
+ */
+class JavadocGenerally {
+	/**
+	 * Doc on field
+	 */
+	private int someField;
+	/**
+	 * Doc on method
+	 */
+	public void test() {
+	}
+	/**
+	 * Doc on inner
+	 */
+	public interface TestingInner {
+	}
+}