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, 15 insertions, 8 deletions

diff --git a/website/features/index.html b/website/features/index.html
index 37038ddb..f9b8cdfa 100644
--- a/website/features/index.html
+++ b/website/features/index.html
@@ -13,10 +13,14 @@
 		<h1>Lombok features</h1>
 		<div class="index overview">
 			<dl>
+				<dt><a href="val.html"><code>val</code></a></dt>
+				<dd>Finally! Hassle-free final local variables.</dd>
+				<dt><a href="NonNull.html"><code>@NonNull</code></a></dt>
+				<dd>or: How I learned to stop worrying and love the NullPointerException.</dd>
+				<dt><a href="Cleanup.html"><code>@Cleanup</code></a></dt>
+				<dd>Automatic resource management: Call your <code>close()</code> methods safely with no hassle.</dd>
 				<dt><a href="GetterSetter.html"><code>@Getter</code> / <code>@Setter</code></a></dt>
 				<dd>Never write <code>public int getFoo() {return foo;}</code> again.</dd>
-				<dt><a href="GetterLazy.html"><code>@Getter(lazy=true)</code></a></dt>
-				<dd>Laziness is a virtue!</dd>
 				<dt><a href="ToString.html"><code>@ToString</code></a></dt>
 				<dd>No need to start a debugger to see your fields: Just let lombok generate a <code>toString</code> for you!</dd>
 				<dt><a href="EqualsAndHashCode.html"><code>@EqualsAndHashCode</code></a></dt>
@@ -26,16 +30,16 @@
 				<dt><a href="Data.html"><code>@Data</code></a></dt>
 				<dd>All together now: A shortcut for <code>@ToString</code>, <code>@EqualsAndHashCode</code>,
 					<code>@Getter</code> on all fields, and <code>@Setter</code> on all non-final fields, and <code>@RequiredArgsConstructor</code>!</dd>
-				<dt><a href="Cleanup.html"><code>@Cleanup</code></a></dt>
-				<dd>Automatic resource management: Call your <code>close()</code> methods safely with no hassle.</dd>
-				<dt><a href="Synchronized.html"><code>@Synchronized</code></a></dt>
-				<dd><code>synchronized</code> done right: Don't expose your locks.</dd>
+				<dt><a href="Value.html"><code>@Value</code></a></dt>
+				<dd>Immutable classes made very easy.</dd>
 				<dt><a href="SneakyThrows.html"><code>@SneakyThrows</code></a></dt>
 				<dd>To boldly throw checked exceptions where no one has thrown them before!</dd>
+				<dt><a href="Synchronized.html"><code>@Synchronized</code></a></dt>
+				<dd><code>synchronized</code> done right: Don't expose your locks.</dd>
+				<dt><a href="GetterLazy.html"><code>@Getter(lazy=true)</code></a></dt>
+				<dd>Laziness is a virtue!</dd>
 				<dt><a href="Log.html"><code>@Log</code></a></dt>
 				<dd>Captain's Log, stardate 24435.7: &quot;What was that line again?&quot;</dd>
-				<dt><a href="val.html"><code>val</code></a></dt>
-				<dd>Finally! Hassle-free final local variables.</dd>
 				<dt><a href="Delegate.html"><code>@Delegate</code></a></dt>
 				<dd>Don't lose your composition.</dd>
 				<dt><a href="experimental/index.html">experimental features</a></dt>
@@ -43,6 +47,9 @@
 			</dl>
 		</div>
 		<div class="pointer">
+			If you'd rather read a longer tutorial, <a href="http://jnb.ociweb.com/jnb/jnbJan2010.html">here is a great tutorial (including a walkthrough through some of the above features)</a> written by Michael Kimberlin.
+		</div>
+		<div class="pointer">
 			The documentation above is a lot easier to follow, but if you want to build your own transformations,
 			or you want to add javadoc to <code>lombok.jar</code> in your IDE, you can also check out <a href="../api/index.html">the javadoc</a>.
 		</div>