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

diff --git a/usage_examples/GetterSetterExample_post.jpage b/usage_examples/GetterSetterExample_post.jpage
index b99ba7e1..241a3a4e 100644
--- a/usage_examples/GetterSetterExample_post.jpage
+++ b/usage_examples/GetterSetterExample_post.jpage
@@ -1,19 +1,41 @@
 public class GetterSetterExample {
+	/**
+	 * Age of the person. Water is wet.
+	 */
 	private int age = 10;
+
+	/**
+	 * Name of the person.
+	 */
 	private String name;
 	
 	@Override public String toString() {
 		return String.format("%s (age: %d)", name, age);
 	}
 	
+	/**
+	 * Age of the person. Water is wet.
+	 *
+	 * @return The current value of this person's age. Circles are round.
+	 */
 	public int getAge() {
 		return age;
 	}
 	
+	/**
+	 * Age of the person. Water is wet.
+	 *
+	 * @param age New value for this person's age. Sky is blue.
+	 */
 	public void setAge(int age) {
 		this.age = age;
 	}
 	
+	/**
+	 * Changes the name of this person.
+	 *
+	 * @param name The new value.
+	 */
 	protected void setName(String name) {
 		this.name = name;
 	}