Merge branch 'hotfix-1.5.1' into develop

CHANGELOG

+BornAgain-1.5.1, released 2016.02.18
+Hotfix:
+  * Bug #1341: GUI crashes if simulating with 1D lattice interference function
+  * Bug #1338: Crash while saving certain project file
+
 BornAgain-1.5.0, released 2016.02.15
   > API changes
     1) FTDecayFunctions introduced to use together with lattices (setDecayFunction)

GUI/coregui/Models/JobResultsPresenter.cpp

@@ -102,7 +102,7 @@ void JobResultsPresenter::updateDataAxes(IntensityDataItem *intensityItem,
 void JobResultsPresenter::saveIntensityData(JobItem *jobItem, const QString &projectDir)
 {
     IntensityDataItem *dataItem = jobItem->getIntensityDataItem();
-    if (dataItem) {
+    if (dataItem && dataItem->getOutputData()) {
         QString filename = projectDir + QStringLiteral("/") + dataItem->itemName();
 
         std::unique_ptr<OutputData<double>> dataToSave(

GUI/coregui/Models/item_constants.h

@@ -156,7 +156,7 @@ const ModelType DistributionExtendedGroup = "Distribution extended group";
 const ModelType FTDistribution1DGroup = "PDF 1D";
 const ModelType FTDistribution2DGroup = "PDF 2D";
 const ModelType FTDecayFunction1DGroup = "Decay function 1D";
-const ModelType FTDecayFunction2DGroup = "Decay function 1D";
+const ModelType FTDecayFunction2DGroup = "Decay function 2D";
 const ModelType LatticeGroup = "Lattice group";
 const ModelType MaterialGroup = "Material group";
 const ModelType ResolutionFunctionGroup = "Resolution function group";

VERSION.cmake

 set(BornAgain_VERSION_MAJOR 1)
 set(BornAgain_VERSION_MINOR 5)
-set(BornAgain_VERSION_PATCH 0)
+set(BornAgain_VERSION_PATCH 1)