anchor.diff:  The example code creates one [classname]#TextField# to allow the user to input her name and a [classname]#Button# whose click listener dynamically adds a new [classname]#Label# component to the main layout.
   In the end of the [methodname]#init()# method, we just configure the main layout and place components into it and set it to be the content of [classname]#MyUI#.
   
  -<<<<<<< HEAD
   To test your first Vaadin application, right-click on the project and choose "Debug as > Maven build...".
   The debug mode is slightly slower than the basic run mode, but it often helps you to figure out what is happening in your application.
  -=======
  +
   [[figure.framework.tutorial.debug-as-maven-build]]
   .Starting the server using a Maven target
   image::img/debugAsMavenBuild.jpg[]
  ->>>>>>> Tutorial navigation and formatting
  -
  -.Starting the server using a Maven target
  -image::debugAsMavenBuild.jpg[]
  -
  -<<<<<<< HEAD
  +
   In the dialog, type `Run in jetty` to the [guilabel]#Name# input and `jetty:run` to the [guilabel]#Goals# input.
   
  +[[figure.framework.tutorial.jetty-run]]
   .Generating a Maven launch for `jetty:run` target
  -image::debugAsMavenBuild2.jpg[]
  -=======
  -[[figure.framework.tutorial.jetty-run]]
  -.Generating a Maven launch for jetty:run target
   image::img/debugAsMavenBuild2.jpg[]
  ->>>>>>> Tutorial navigation and formatting
   
   Before clicking debug, to make sure debugging works properly, add your Java
   project to the source lookup path from the [guilabel]#Source# tab, as it is being done in <<figure.tutorial.creating.add-sources>>.
   
  -<<<<<<< HEAD
   [[figure.tutorial.creating.add-sources]]
   .Adding sources for debugging
  -image::debugAsMavenBuildAddSources.jpg[]
  -=======
  -[[figure.framework.tutorial.add-sources]]
  -.Adding sources for debugging
   image::img/debugAsMavenBuildAddSources.jpg[]
  ->>>>>>> Tutorial navigation and formatting
   
   Now click [guibutton]#Debug# to continue.
   This will download a small Java web server (if not cached to your local Maven repository), and use it to host your application.
  
positive.code: +
  [[figure.framework.tutorial.create-maven-project]]
  .Create a new Maven project
  <<<<<<< HEAD
  image::createMavenProject.jpg[width=70%]
  =======
  image::img/createMavenProject.jpg[]
  >>>>>>> Tutorial navigation and formatting
  +
  TIP: If the [guilabel]#Maven Project# is not visible in the menu, you should switch to the _Java EE_ perspective.
  You can use the shortcut button in the tool bar or "Window > Perspective" to switch to the perspective.
  
negative.code: . In the second step, you need to choose the `vaadin-archetype-application` archetype.
  +
  .Selecting the archetype
  image::img/projectWizard2-top.jpg[width=70%]
  +
  You can first try to find it using the filtering function.
  +
  If Eclipse has not yet indexed the archetype catalog, you need to manually add the archetype details.
  // +
  // .Adding a new archetype
  // image::img/projectWizard2-add.jpg[width=70%]
  +
  Click the [guibutton]#Add Archetype# button.
  +
  .Settings for a new archetype
  image::img/projectWizardAddArchetype-crop.jpg[width=70%]
  +
  Enter the following values:
  +
  