Merge remote-tracking branch 'origin/cades_dev' into cades_dev_local

# Conflicts:
#	setup.py

docs/_autosummary/backreferences/pycroscopy.analysis.be_sho.SHOestimateGuess.examples

@@ -9,9 +9,9 @@ Examples using ``pycroscopy.analysis.be_sho.SHOestimateGuess``
 
 .. only:: html
 
-    .. figure:: /auto_examples/images/thumb/sphx_glr_tutorial_04_parallel_computing_thumb.png
+    .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_04_parallel_computing_thumb.png
 
-        :ref:`sphx_glr_auto_examples_tutorial_04_parallel_computing.py`
+        :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_04_parallel_computing.py`
 
 .. raw:: html
 
@@ -19,4 +19,22 @@ Examples using ``pycroscopy.analysis.be_sho.SHOestimateGuess``
 
 .. only:: not html
 
-    * :ref:`sphx_glr_auto_examples_tutorial_04_parallel_computing.py`
+    * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_04_parallel_computing.py`
+
+.. raw:: html
+
+    <div class="sphx-glr-thumbcontainer" tooltip="**Suhas Somnath, Chris R. Smith**">
+
+.. only:: html
+
+    .. figure:: /auto_tutorials/images/thumb/sphx_glr_plot_tutorial_04_parallel_computing_thumb.png
+
+        :ref:`sphx_glr_auto_tutorials_plot_tutorial_04_parallel_computing.py`
+
+.. raw:: html
+
+    </div>
+
+.. only:: not html
+
+    * :ref:`sphx_glr_auto_tutorials_plot_tutorial_04_parallel_computing.py`

docs/_autosummary/backreferences/pycroscopy.analysis.be_sho.SHOfunc.examples

@@ -9,9 +9,9 @@ Examples using ``pycroscopy.analysis.be_sho.SHOfunc``
 
 .. only:: html
 
-    .. figure:: /auto_examples/images/thumb/sphx_glr_tutorial_04_parallel_computing_thumb.png
+    .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_04_parallel_computing_thumb.png
 
-        :ref:`sphx_glr_auto_examples_tutorial_04_parallel_computing.py`
+        :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_04_parallel_computing.py`
 
 .. raw:: html
 
@@ -19,4 +19,22 @@ Examples using ``pycroscopy.analysis.be_sho.SHOfunc``
 
 .. only:: not html
 
-    * :ref:`sphx_glr_auto_examples_tutorial_04_parallel_computing.py`
+    * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_04_parallel_computing.py`
+
+.. raw:: html
+
+    <div class="sphx-glr-thumbcontainer" tooltip="**Suhas Somnath, Chris R. Smith**">
+
+.. only:: html
+
+    .. figure:: /auto_tutorials/images/thumb/sphx_glr_plot_tutorial_04_parallel_computing_thumb.png
+
+        :ref:`sphx_glr_auto_tutorials_plot_tutorial_04_parallel_computing.py`
+
+.. raw:: html
+
+    </div>
+
+.. only:: not html
+
+    * :ref:`sphx_glr_auto_tutorials_plot_tutorial_04_parallel_computing.py`