Merge branch 'master' of github.com:codelearn-org/android-tutorial-views

Author: PaulDaviesC

twitter-client-tutorial/_import_codelearn_project.html.md

@@ -1,14 +1,18 @@
+In this setup lesson, you will be provided with an app that you can download & try the current module. This is helpful if you are directly jumping to this module or if you have messed up your app somewhere & want to start afresh but not from the start of the Twitter App tutorial.
 
-In the previous level, we installed Codelearn Eclipse Plugin.
+> If you have been following our Twitter App tutorial from the start & has a perfectly running app at the end of the previous module, you may simply skip this setup lesson.
 
-Follow the steps below to import an Android project, which will be used by you for the rest of the challenge.
+1. <%= link_to "Download CodelearnTwitterApp project", download_import_project_zip_path(@current.lesson_module.lesson.token, @current.lesson.token) %> and import it in Eclipse. This is the app a user would have built if he has followed our tutorial till the end of the previous module.
 
-1. <%= link_to "Download CodelearnTwitterChallenge Eclipe project", download_import_project_zip_path(@current.lesson_module.lesson.token, @current.lesson.token) %> and import it in Eclipse.
+	Note that if you already have CodelearnTwitterApp project in your Eclipse, you will not be able to import this project in the workspace. You would either need to remove the previous project by deleting it or unzip the downloaded project & change the project name inside `<name>CodelearnTwitterApp</name>` in .project file & then import the project into Eclipse.
+
+	**Possible Error - Unable to resolve 'android-19'** - The CodelearnTwitterApp project takes the latest Android API by default. Most probably, you are seeing this as your Android SDK is old. Quick fix is - checkout the Android API version in [Android SDK Directory] -> sdk -> platforms directory & modify `target=19` in **project.properties** file to your Android API version. 
+
+2. If this is your first time with Codelearn App tutorial, we would like to tell you about the Custom Eclipse Launcher that we have built to let you evaluate your app at the end of a tutorial lesson. 
+
+	On the Eclipse project, **[right click on CodelearnTwitterApp] -> Run As -> Android App Codelearn ** or simply hit the **Run button** on the top of Eclipse which will show the popup below. *Remember to choose 'Android App Codelearn' option as against 'Android Application'*. The Launcher will do the normal Android App deployment & will send a copy of your app to our server for evaluation.
 
-2. From next lesson onwards you will be building your application on this imported project. So to run it from next lesson you can either choose to **[right click on CodelearnTwitterApp] -> Run As -> Android App Codelearn ** or simply hit the **Run button** on the top of Eclipse which will show the popup below. *Remember to choose 'Android App Codelearn' option as against 'Android Application'*. Now you can go to the next lesson.
 <p>
 <%= image_tag "twitter-client/plugin-newproject-run-menu.png", alt: "Codelearn Run Configuration", title: "Codelearn Run Configuration" %>
 </p>
-## Possible Errors
 
-**1. Unable to resolve 'android-19'** - The CodelearnTwitterApp project takes the latest Android API by default. Most probably, you are seeing this as your Android SDK is old. Quick fix is - checkout the Android API version in [Android SDK Directory] -> sdk -> platforms directory & modify `target=19` in **project.properties** file to your Android API version. 

twitter-client-tutorial/_plugin_installation.html.md

@@ -37,8 +37,6 @@ Download Android SDK from [official Android SDK download page](http://developer.
 		</div>
 		</p>
 		</small>
-	<li>Once a lesson is complete, the <%= link_to "Next >", "#", class: "btn btn-inverse" %> button at the bottom of the lesson gets activated. Also a green bar with <%= link_to "< Prev", "#", class: "btn btn-inverse" %> & <%= link_to "Next >", "#", class: "btn btn-inverse" %> buttons appear on the top of the lesson with a message telling that you have completed the lesson.</li>
-    <p><%= image_tag "twitter-client/green-navigation-bar.png" %></p>
 </ol>
 
 <div class="alert alert-info">More elaborate setup instructions are available in the <b><%= link_to "Android Setup page", android_concept_lesson_path("android-setup") %></b></div>