Documentation Update

- Added faq question/answer.
- Clarified file format upgrade via backup warning.

html/task.html

@@ -58,11 +58,8 @@
                 <li><a href="filter.html">Filters</a>
                 <li><a href="shadow.html">Shadow Files</a>
                 <li><a href="custom.html">Custom Reports</a>
-<<<<<<< HEAD:html/task.html
-                <li><a href="faq.html">Frequently Asked Questions</a>
-=======
                 <li><a href="import.html">Data Import</a>
->>>>>>> import:html/task.html
+                <li><a href="faq.html">Frequently Asked Questions</a>
               </ul>
 
               <p>
@@ -129,6 +126,8 @@
                       full details.
                   <li>Export was including 'id' in the column header even though it was not
                       included in the data.
+                  <li>The task file format has changed slightly.  Please back up your task
+                      data files before upgrading to 1.6.0.
                 </ul>
 
                 <p>