Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/dr/app/beauti/util/BEAUTiImporter.java

.gitignore

@@ -16,3 +16,6 @@ out/
 !ci/**/*.xml
 
 zig_zag
+
+*.dmg
+release/Mac

build.xml

@@ -203,13 +203,14 @@
                 <include name="dr/evomodel/branchratemodel/**/*.class"/>
                 <include name="dr/evomodel/clock/**/*.class"/>
                 <include name="dr/evomodel/coalescent/**/*.class"/>
+                <include name="dr/evomodel/continuous/**/*.class"/>
                 <include name="dr/evomodel/operators/**/*.class"/>
                 <include name="dr/evomodel/sitemodel/**/*.class"/>
                 <include name="dr/evomodel/speciation/**/*.class"/>
                 <include name="dr/evomodel/substmodel/**/*.class"/>
                 <include name="dr/evomodel/tree/**/*.class"/>
                 <include name="dr/evomodel/treelikelihood/**/*.class"/>
-                <exclude name="dr/evomodel/treedatalikelihood/MultiPartitionDataLikelihoodDelegate*"/>
+                <include name="dr/evomodel/treedatalikelihood/**/*.class"/>
                 <include name="dr/evomodelxml/**/*.class"/>
                 <exclude name="dr/evomodelxml/treedatalikelihood/MultiPartitionDataLikelihoodDelegate*"/>
                 <include name="dr/evoxml/**/*.class"/>

ci/TestXML/ToyLogisticHMCPrec.xml

@@ -202,6 +202,11 @@
 		<populationTree>
 			<treeModel idref="treeModel"/>
 		</populationTree>
+		<intervals>
+			<bigFastTreeIntervals id="bigFastTreeIntervals">
+				<treeModel idref="treeModel"/>
+			</bigFastTreeIntervals>
+		</intervals>
 	</coalescentLikelihood>
 
 	<coalescentGradient id="coalescentGradient">