Merge branch 'master' into lttng_2_0_control_dev

Conflicts:
	lttng/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java

diff --cc org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java
index 2eb9b64bed946ee446c84112ad105593c67881d3,87e6a9f557e4b54610e3dae7c804c7c6ae2ee35e..e5f235ad0dc640b18525d8d7e5fc2e6932acf350
--- 1/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java
--- 2/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java
+++ b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java
@@@ -7,11 -7,7 +7,10 @@@ public class AllLTTngUITests  
      public static Test suite() {
          TestSuite suite = new TestSuite(AllLTTngUITests.class.getName());
          //$JUnit-BEGIN$
 +        suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.control.model.impl.AllTests.suite());
 +        suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.control.service.AllTests.suite());
          suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.distribution.AllTests.suite());
-         suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.histogram.AllTests.suite());
 +        suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.control.model.component.AllTests.suite());
          //$JUnit-END$
          return suite;
      }

diff --cc org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
Simple merge

diff --cc org.eclipse.linuxtools.lttng.ui/plugin.xml
Simple merge

diff --cc org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java
index e549957dbf423a3b946061508821e5576df14040,8bff779fdc19aec7bdbacad813a7d965a491dd12..2bd3fbe8631d8e54440df764cc65769748a45c70
--- 1/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java
--- 2/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java
@@@ -12,9 -12,7 +12,8 @@@
  
  package org.eclipse.linuxtools.lttng.ui.views;
  
 +import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
  import org.eclipse.linuxtools.lttng.ui.views.controlflow.ControlFlowView;
- import org.eclipse.linuxtools.lttng.ui.views.histogram.HistogramView;
  import org.eclipse.linuxtools.lttng.ui.views.resources.ResourcesView;
  import org.eclipse.linuxtools.lttng.ui.views.statistics.StatisticsView;
  import org.eclipse.linuxtools.tmf.ui.views.events.TmfEventsView;