Merge branch 'develop' into export_fine_grain

Author: eisneinechse

doc/titles.rst

@@ -43,9 +43,9 @@ Overview
 
 Custom Titles
 -------------
-OpenShot can use any vector SVG image file as a title template. Just add an SVG image file to your */.openshot_qt/titles/*
-folder, and it will appear in OpenShot's title editor after you restart OpenShot. You can also right click on any SVG
-files in your **Project Files** panel, and choose **Edit Title** or **Duplicate Title**.
+OpenShot can use any vector SVG image file as a title template. Just add an SVG image file to your 
+*.openshot_qt/title_templates/* folder, and it will appear the next time you open the Title Editor interface. You can
+also right click on any SVG files in your **Project Files** panel, and choose **Edit Title** or **Duplicate Title**.
 
 3D Animated Titles
 ------------------
@@ -65,4 +65,3 @@ in the main menu of OpenShot) to launch the Animated Title editor. You can also
 
 This feature requires the latest version of Blender (https://www.blender.org/download/) be installed, and the OpenShot
 **Preferences** updated with the correct path to the Blender executable (for example: */home/USER/blender-2.78/blender*).
-