Merge branch 'master' into revert_python_module_removal

modified:   src/programs/Utilities/hddm/hddm-cpp.cpp
fixes building of python modules for hddm

Author: markito3

src/programs/Utilities/hddm/hddm-cpp.cpp

@@ -606,8 +606,12 @@ int main(int argC, char* argV[])
    "                                    hddm_type *atype=0) const {\n"
    "      return 0;\n"
    "   }\n"
-   "   virtual std::string toString(int indent=0) = 0;\n"
-   "   virtual std::string toXML(int indent=0) = 0;\n"
+   "   virtual std::string toString(int indent=0) {\n"
+   "      return \"bad apple\";\n"
+   "   }\n"
+   "   virtual std::string toXML(int indent=0) {\n"
+   "      return \"<!--bad apple-->\";\n"
+   "   }\n"
    "   friend class HDDM_ElementList<HDDM_Element>;\n"
    " protected:\n"
    "   HDDM_Element() : m_parent(0), m_host(0) {}\n"