Finish the app fundamentals rewrite by updating the side nav and resolving links in the dev guide
Also move the app fundamentals document back to fundamentals.jd
TODO: resolve links in the javadocs

Change-Id: Ia3c81a83bf7fe75f7942fd41bfb1d626ee72d5d9
diff --git a/docs/html/guide/index.jd b/docs/html/guide/index.jd
index 1674bc8..5f0c6a5 100644
--- a/docs/html/guide/index.jd
+++ b/docs/html/guide/index.jd
@@ -28,7 +28,7 @@
 
 <dt><b>Framework Topics</b></dt>
 <dd>Discussions of particular parts of the Android framework
-and API.  For an overview of the framework, begin with
+and API.  For an introduction to the framework, begin with
 <a href="{@docRoot}guide/topics/fundamentals.html">Application
 Fundamentals</a>.  Then explore other topics &mdash; from 
 designing a user interface and setting up resources to storing 
@@ -69,7 +69,7 @@
 tutorial walks you through a standard "Hello, World" application as 
 it would be written for the Android platform.  The 
 <a href="{@docRoot}guide/topics/fundamentals.html">Application
-Fundamentals</a> document is a good place to start for an 
+Fundamentals</a> documentation is a good place to start for an 
 understanding of the application framework.
 </p>