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, 7 insertions, 0 deletions

diff --git a/src/stubs/com/sun/tools/javac/parser/Scanner.java b/src/stubs/com/sun/tools/javac/parser/Scanner.java
index af94bacc..266208e5 100644
--- a/src/stubs/com/sun/tools/javac/parser/Scanner.java
+++ b/src/stubs/com/sun/tools/javac/parser/Scanner.java
@@ -59,4 +59,11 @@ public class Scanner implements Lexer {
 	public char[] getRawCharacters(int beginIndex, int endIndex) {
 		return null;
 	}
+	
+	public void nextToken() {
+	}
+	
+	public char[] getRawCharacters() {
+		return new char[0];
+	}
 }