Merge branch 'master' into '45-some-questions-on-master-after-47-merge'

# Conflicts:
#   source/SED.h

source/SED.h

@@ -176,8 +176,8 @@ public:
     void fit_normalization(const onesource& source, const int imagm);
     void fit_normalizationIR(const onesource& source, const int imagm, const double dmcor);
     void fit_chi2(const onesource& source, const int imagm);
-    void fit_chi2IR(const onesource& source, const int imagm, const bool fit_frsc, const double dmcor);
-  inline bool is_same_model(const SED& other) {return ((*this).nummod == other.nummod && (*this).ebv == other.ebv) ;}
+    void fit_chi2IR(const onesource& source, const int imagm, const string fit_frsc, const double dmcor);
+    inline bool is_same_model(const SED& other) {return ((*this).nummod == other.nummod && (*this).ebv == other.ebv && (*this).age == other.age) ;}
 };