Merge remote-tracking branch 'refs/remotes/origin/master'

Merge remote-tracking branch 'refs/remotes/origin/master'

 Conflicts:
	src/Tools/Config/Define.inc

 It looks like you may be committing a merge.
 If this is not correct, please run
	git update-ref -d MERGE_HEAD
 and try again.

 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.

 On branch master
 Your branch and 'origin/master' have diverged,
 and have 1 and 7 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)

 All conflicts fixed but you are still merging.

 Changes to be committed:
	new file:   bin/eosStarFileCopy
	modified:   bin/wish/Display2/tclIndex
	modified:   hostdepend/ARM64MAC64
	modified:   include/pdbFile.h
	modified:   src/Objects/DataExpress/Contour/doc/Contour.html
	modified:   src/Objects/DataExpress/TclTk/doc/TclTk.html
	modified:   src/Objects/DataExpress/avsFile/doc/avsFile.html
	modified:   src/Objects/DataExpress/eosOpenGL/doc/eosOpenGL.html
	modified:   src/Objects/DataExpress/eosRuby/src/Swig/mkmf.log
	modified:   src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c
	modified:   src/Objects/DataExpress/gifFile/doc/gifFile.html
	modified:   src/Objects/DataExpress/pngFile/doc/pngFile.html
	modified:   src/Objects/DataExpress/psFile/doc/psFile.html
	modified:   src/Objects/DataManip/.Source.org
	modified:   src/Objects/DataManip/bildFile/doc/bildFile.html
	modified:   src/Objects/DataManip/bmpFile/doc/bmpFile.html
	modified:   src/Objects/DataManip/ctfInfo/doc/ctfInfo.html
	modified:   src/Objects/DataManip/dmFile/doc/dmFile.html
	modified:   src/Objects/DataManip/dsn6File/doc/dsn6File.html
	modified:   src/Objects/DataManip/emData/doc/emData.html
	modified:   src/Objects/DataManip/eosStarFile/doc/eosStarFile.html
	new file:   src/Objects/DataManip/eosStarFile/src/X86LINUX64
	modified:   src/Objects/DataManip/khorosData/doc/khorosData.html
	modified:   src/Objects/DataManip/largeIP/doc/largeIP.html
	modified:   src/Objects/DataManip/llData/doc/llData.html
	modified:   src/Objects/DataManip/ltlgData/doc/ltlgData.html
	modified:   src/Objects/DataManip/mapFile/doc/mapFile.html
	modified:   src/Objects/DataManip/mrcImage/doc/mrcImage.html
	modified:   src/Objects/DataManip/mrcImageShape/doc/mrcImageShape.html
	modified:   src/Objects/DataManip/pdbFile/doc/pdbFile.html
	modified:   src/Objects/DataManip/rigakuImage/doc/rigakuImage.html
	modified:   src/Objects/DataManip/tgaFile/doc/tgaFile.html
	modified:   src/Objects/DataManip/transform/doc/transform.html
	modified:   src/Objects/General/Cluster/doc/Cluster.html
	modified:   src/Objects/General/Crystal/doc/Crystal.html
	modified:   src/Objects/General/Map2D/doc/Map2D.html
	modified:   src/Objects/General/Matrix3D/doc/Matrix3D.html
	modified:   src/Objects/General/Memory/doc/Memory.html
	modified:   src/Objects/General/PVM/doc/PVM.html
	modified:   src/Objects/General/Random/doc/Random.html
	modified:   src/Objects/General/Socket/doc/Socket.html
	modified:   src/Objects/General/SpecialNumber/doc/SpecialNumber.html
	modified:   src/Objects/General/Vector/doc/Vector.html
	modified:   src/Objects/General/eosBayes/doc/eosBayes.html
	modified:   src/Objects/General/eosFunc/doc/eosFunc.html
	modified:   src/Objects/General/eosMath/doc/eosMath.html
	modified:   src/Objects/General/eosPThread/doc/eosPThread.html
	modified:   src/Objects/General/eosPoint/doc/eosPoint.html
	modified:   src/Objects/Makefile
	modified:   src/Tools/Config/Define.inc
	deleted:    src/Tools/Config/Define.inc.org
	deleted:    src/Tools/Config/Define.inc.orig
	modified:   src/Tools/DCDFile/dcdCompareCA/src/dcdCompareCA.html
	modified:   src/Tools/DCDFile/dcdDistanceAtomBetweenAtom/src/dcdDistanceAtomBetweenAtom.html
	modified:   src/Tools/Integration/Display3/src/Display3.html
	modified:   src/Tools/Integration/Eos/src/Eos.html
	modified:   src/Tools/Integration/StereoDisplay/src/StereoDisplay.html
	modified:   src/Tools/Integration/Visualmake/src/Visualmake.html
	modified:   src/Tools/Integration/imagesClustering/src/imagesClustering.html
	modified:   src/Tools/Integration/imagesView/src/imagesView.html
	modified:   src/Tools/Integration/obj3Don2DImageView/src/obj3Don2DImageView.html
	modified:   src/Tools/Integration/smolet/src/smolet.html
	modified:   src/Tools/crystal/crystalGetLatticeVolume/src/crystalGetLatticeVolume.html
	modified:   src/Tools/crystal/crystalGetReciprocalLattice/src/crystalGetReciprocalLattice.html
	modified:   src/Tools/ctfInfo/ctfDeterminationByBayes/src/ctfDeterminationByBayes.html
	modified:   src/Tools/ctfInfo/ctfDeterminationFromPhaseComparison/src/ctfDeterminationFromPhaseComparison.html
	modified:   src/Tools/ctfInfo/ctfDeterminationFromThonRing/src/ctfDeterminationFromThonRing.html
	modified:   src/Tools/ctfInfo/ctfDetermine/src/ctfDetermine.html
	modified:   src/Tools/ctfInfo/ctfEnvelopFunction/src/ctfEnvelopFunction.html
	modified:   src/Tools/ctfInfo/ctfFunction/src/ctfFunction.html
	modified:   src/Tools/ctfInfo/ctfFunctionServer/src/ctfFunctionServer.html
	modified:   src/Tools/ctfInfo/ctfInfoSet/src/ctfInfoSet.html
	modified:   src/Tools/ctfInfo/ctfMultiFunction/src/ctfMultiFunction.html
	modified:   src/Tools/ctfInfo/ctfWeightMapCreation/src/ctfWeightMapCreation.html
	modified:   src/Tools/ctfInfo/ctfZeroPoint/src/ctfZeroPoint.html
	modified:   src/Tools/ctfInfo/defocusDeterminationFromThonRing/src/defocusDeterminationFromThonRing.html
	modified:   src/Tools/ctfInfo/electronWaveLength/src/electronWaveLength.html
	modified:   src/Tools/ctfInfo/molecularEnvelopeResampling/src/molecularEnvelopeResampling.html
	modified:   src/Tools/ctfInfo/tiltInfoDetermine/src/tiltInfoDetermine.html
	modified:   src/Tools/database/homology2PG/src/homology2PG.html
	modified:   src/Tools/database/pgDataBaseSelectServer/src/pgDataBaseSelectServer.html
	modified:   src/Tools/database/pgJournalSelect/src/pgJournalSelect.html
	modified:   src/Tools/database/pgJournalSelectCORBAClient/src/pgJournalSelectCORBAClient.html
	modified:   src/Tools/database/pgJournalSelectCORBAServer/src/pgJournalSelectCORBAServer.html
	modified:   src/Tools/database/pgMemoSelectCORBAServer/src/pgMemoSelectCORBAServer.html
	modified:   src/Tools/database/pgSelect/src/pgSelect.html
	modified:   src/Tools/eosBayes/eosBayesInit/src/eosBayesInit.html
	new file:   src/Tools/eosPoint/eosPointAffineTransform/src/X86LINUX64
	modified:   src/Tools/eosPoint/eosPointAffineTransform/src/eosPointAffineTransform.html
	modified:   src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.html
	modified:   src/Tools/eosPoint/eosPointPositionCorrection/src/eosPointPositionCorrection.html
	modified:   src/Tools/eosPoint/eosPointProjector/src/eosPointProjector.html
	new file:   src/Tools/eosStarFile/eosStarFileCopy/src/X86LINUX64
	new file:   src/Tools/eosStarFile/eosStarFileCopy/src/eosStarFileCopy.html
	modified:   src/Tools/filter/moi2mrc/src/moi2mrc.html
	modified:   src/Tools/filter/mrc2gif/src/mrc2gif.html
	modified:   src/Tools/filter/mrc2hdf/src/mrc2hdf.c
	modified:   src/Tools/filter/mrc2lattice/src/mrc2lattice.html
	modified:   src/Tools/filter/mrc2png/src/mrc2png.html
	modified:   src/Tools/filter/mrc2pov/src/mrc2pov.html
	modified:   src/Tools/filter/mrc2viff/src/mrc2viff.html
	modified:   src/Tools/hf2000/hf2000Init/src/hf2000Init.html
	modified:   src/Tools/hf2000/hf2000LenzCurrent/src/hf2000LenzCurrent.html
	modified:   src/Tools/hf2000/hf2000SpecimenPosition/src/hf2000SpecimenPosition.html
	modified:   src/Tools/khorosTool/khorosFilterGenerate/src/khorosFilterGenerate.html
	modified:   src/Tools/llData/llDataAverage/src/llDataAverage.html
	modified:   src/Tools/llData/llDataAxisSearch/src/llDataAxisSearch.html
	modified:   src/Tools/llData/llDataCTFCompensate/src/llDataCTFCompensate.html
	modified:   src/Tools/llData/llDataFitServer/src/llDataFitServer.html
	modified:   src/Tools/llData/llDataMultiCTFCompensation/src/llDataMultiCTFCompensation.html
	modified:   src/Tools/llData/llDataPrint/src/llDataPrint.html
	modified:   src/Tools/llData/llDataRotation/src/llDataRotation.html
	modified:   src/Tools/llData/llDataSeparate/src/llDataSeparate.html
	modified:   src/Tools/matrix3D/matrix3DEulerAngleTransform/src/matrix3DEulerAngleTransform.html
	modified:   src/Tools/matrix3D/matrix3DFromEulerAngle/src/matrix3DFromEulerAngle.html
	modified:   src/Tools/matrix3D/matrix3DInverse/src/matrix3DInverse.html
	modified:   src/Tools/mrcImage/.Source.org
	modified:   src/Tools/mrcImage/fft2d/src/fft2d.html
	modified:   src/Tools/mrcImage/mrc2dsn6/src/mrc2dsn6.html
	modified:   src/Tools/mrcImage/mrc2hdf/src/mrc2hdf.html
	modified:   src/Tools/mrcImage/mrcFFTCTFCompensation/src/mrcFFTCTFCompensation.html
	modified:   src/Tools/mrcImage/mrcFFTCentralSection/src/mrcFFTCentralSection.html
	modified:   src/Tools/mrcImage/mrcFFTCentralSectionCompare/src/mrcFFTCentralSectionCompare.html
	modified:   src/Tools/mrcImage/mrcFFTIQEstimation/src/mrcFFTIQEstimation.html
	modified:   src/Tools/mrcImage/mrcImage1dCutAverage/src/mrcImage1dCutAverage.html
	modified:   src/Tools/mrcImage/mrcImage3DCTFObservation/src/mrcImage3DCTFObservation.html
	modified:   src/Tools/mrcImage/mrcImage3DPeakGet/src/mrcImage3DPeakGet.html
	modified:   src/Tools/mrcImage/mrcImageAddValue/src/mrcImageAddValue.html
	modified:   src/Tools/mrcImage/mrcImageAutoFilamentExtract/src/mrcImageAutoFilamentExtract.html
	modified:   src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/mrcImageAutoRotationCorrelation.html
	modified:   src/Tools/mrcImage/mrcImageAutoRotationCorrelationResultPrint/src/mrcImageAutoRotationCorrelationResultPrint.html
	modified:   src/Tools/mrcImage/mrcImageAutoTriming/src/mrcImageAutoTriming.html
	modified:   src/Tools/mrcImage/mrcImageBilateralFilter/src/mrcImageBilateralFilter.html
	new file:   src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86LINUX64
	modified:   src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/mrcImageBlurByTemperatureFactor.html
	modified:   src/Tools/mrcImage/mrcImageCTFCompensation/src/mrcImageCTFCompensation.html
	modified:   src/Tools/mrcImage/mrcImageCTFCompensationForTiltImage/src/mrcImageCTFCompensationForTiltImage.html
	modified:   src/Tools/mrcImage/mrcImageCTFDetermination/src/mrcImageCTFDetermination.html
	modified:   src/Tools/mrcImage/mrcImageCTFObservation/src/mrcImageCTFObservation.html
	modified:   src/Tools/mrcImage/mrcImageCTFSN/src/mrcImageCTFSN.html
	modified:   src/Tools/mrcImage/mrcImageColoring/src/mrcImageColoring.html
	modified:   src/Tools/mrcImage/mrcImageConvolution/src/mrcImageConvolution.html
	modified:   src/Tools/mrcImage/mrcImageCoreImageCalc/src/mrcImageCoreImageCalc.html
	modified:   src/Tools/mrcImage/mrcImageCorrelationServer/src/mrcImageCorrelationServer.html
	modified:   src/Tools/mrcImage/mrcImageCorrelationWithCTFCompensation/src/mrcImageCorrelationWithCTFCompensation.html
	modified:   src/Tools/mrcImage/mrcImageCrystalDeform/src/mrcImageCrystalDeform.html
	modified:   src/Tools/mrcImage/mrcImageCutAndSetInArray/src/mrcImageCutAndSetInArray.html
	modified:   src/Tools/mrcImage/mrcImageDeconvolution/src/mrcImageDeconvolution.html
	modified:   src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html
	modified:   src/Tools/mrcImage/mrcImageEdgeImageGet/src/mrcImageEdgeImageGet.html
	modified:   src/Tools/mrcImage/mrcImageEnhancementWithFuzzySets/src/mrcImageEnhancementWithFuzzySets.html
	modified:   src/Tools/mrcImage/mrcImageFFTLayerLineExtraction/src/mrcImageFFTLayerLineExtraction.html
	modified:   src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.html
	modified:   src/Tools/mrcImage/mrcImageFOMCalc/src/mrcImageFOMCalc.html
	modified:   src/Tools/mrcImage/mrcImageFilamentSearch/src/mrcImageFilamentSearch.html
	modified:   src/Tools/mrcImage/mrcImageFractalFrourierShellCorrelation/src/mrcImageFractalFrourierShellCorrelation.html
	modified:   src/Tools/mrcImage/mrcImageHelicalConvolution/src/mrcImageHelicalConvolution.html
	modified:   src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/mrcImageMeanFreePathCalc.html
	modified:   src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.html
	new file:   src/Tools/mrcImage/mrcImageMovingModelCreate/src/X86LINUX64
	modified:   src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/mrcImageMultiCTFCompensation.html
	modified:   src/Tools/mrcImage/mrcImageMultiCTFDetermination/src/mrcImageMultiCTFDetermination.html
	modified:   src/Tools/mrcImage/mrcImageNLMeansFilter/src/mrcImageNLMeansFilter.html
	modified:   src/Tools/mrcImage/mrcImageNormalizing/src/mrcImageNormalizing.html
	modified:   src/Tools/mrcImage/mrcImagePad/src/mrcImagePad.html
	modified:   src/Tools/mrcImage/mrcImagePanoramaCreate/src/mrcImagePanoramaCreate.html
	modified:   src/Tools/mrcImage/mrcImagePeakSearch/src/mrcImagePeakSearch.html
	modified:   src/Tools/mrcImage/mrcImagePixelDataGet/src/mrcImagePixelDataGet.html
	modified:   src/Tools/mrcImage/mrcImagePrint/src/mrcImagePrint.html
	modified:   src/Tools/mrcImage/mrcImagePrint3D/src/mrcImagePrint3D.html
	modified:   src/Tools/mrcImage/mrcImagePut3D/src/mrcImagePut3D.html
	modified:   src/Tools/mrcImage/mrcImageROI/src/mrcImageROI.html
	modified:   src/Tools/mrcImage/mrcImageROIs/src/mrcImageROIs.html
	modified:   src/Tools/mrcImage/mrcImageRadialDistribution/src/mrcImageRadialDistribution.html
	modified:   src/Tools/mrcImage/mrcImageSNEstimate/src/mrcImageSNEstimate.html
	new file:   src/Tools/mrcImage/mrcImageSeriesNormalizing/src/X86LINUX64
	modified:   src/Tools/mrcImage/mrcImageShapePCA/src/mrcImageShapePCA.html
	modified:   src/Tools/mrcImage/mrcImageShapePCAFit/src/mrcImageShapePCAFit.html
	modified:   src/Tools/mrcImage/mrcImageShapeRelaxation/src/mrcImageShapeRelaxation.html
	modified:   src/Tools/mrcImage/mrcImageShapeSearch/src/mrcImageShapeSearch.html
	modified:   src/Tools/mrcImage/mrcImageSimilarityEstimate/src/mrcImageSimilarityEstimate.html
	modified:   src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/mrcImageSpatialFrequencyFilter.html
	modified:   src/Tools/mrcImage/mrcImageSphereCheck/src/mrcImageSphereCheck.html
	modified:   src/Tools/mrcImage/mrcImageSuperResolution/src/mrcImageSuperResolution.html
	modified:   src/Tools/mrcImage/mrcImageTiltAxisSearchHelp/src/mrcImageTiltAxisSearchHelp.html
	modified:   src/Tools/mrcImage/mrcImageUnbentROI/src/mrcImageUnbentROI.html
	modified:   src/Tools/mrcImage/mrcImageUnsharpening/src/mrcImageUnsharpening.html
	modified:   src/Tools/mrcImage/mrcImageVarianceAnalysis/src/mrcImageVarianceAnalysis.html
	modified:   src/Tools/mrcImage/mrcImageVolumeCalc/src/mrcImageVolumeCalc.html
	modified:   src/Tools/mrcImage/mrcMultiFFTCentralSectionsSigmaCalc/src/mrcMultiFFTCentralSectionsSigmaCalc.html
	modified:   src/Tools/mrcImage/mrcRefNormalizing/src/mrcRefNormalizing.html
	modified:   src/Tools/mrcImage/mrcView/src/mrcView.html
	modified:   src/Tools/openGL/gmolvie/src/gmolvie.html
	modified:   src/Tools/openGL/molvie/src/molvie.html
	modified:   src/Tools/openGL/molvieDock/src/molvieDock.html
	modified:   src/Tools/openGL/molvieFlight/src/molvieFlight.html
	modified:   src/Tools/openGL/molvieMrcViewer/src/molvieMrcViewer.html
	modified:   src/Tools/openGL/molvieProjection/src/molvieProjection.html
	modified:   src/Tools/openGL/molvieViewer/src/molvieViewer.html
	modified:   src/Tools/pdbUtil/pdb2mrc2d/src/pdb2mrc2d.html
	modified:   src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/pdb2mrc2dWithCTF.html
	modified:   src/Tools/pdbUtil/pdbAtomSection/src/pdbAtomSection.html
	modified:   src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.html
	modified:   src/Tools/pdbUtil/pdbCrystalCreate/src/pdbCrystalCreate.html
	modified:   src/Tools/pdbUtil/pdbHelix/src/pdbHelix.html
	modified:   src/Tools/pdbUtil/pdbHomologySearch/src/pdbHomologySearch.html
	modified:   src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html
	modified:   src/Tools/pdbUtil/pdbMove/src/pdbMove.html
	modified:   src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html
	modified:   src/Tools/pdbUtil/pdbRhoFit/src/pdbRhoFit.html
	modified:   src/Tools/pdbUtil/pdbRhoFitTm/src/pdbRhoFitTm.html
	modified:   src/Tools/pdbUtil/pdbRotation/src/pdbRotation.html
	modified:   src/Tools/pdbUtil/pdbShapeFit/src/pdbShapeFit.html
	modified:   src/Tools/pdbUtil/pdbTempFactorSet/src/pdbTempFactorSet.html
	modified:   src/Tools/pdbUtil/pdbTrans/src/pdbTrans.html
	modified:   src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html
	modified:   src/Tools/pdbUtil/pdbView/src/pdbView.html
	modified:   src/Tools/pickup/mrcImageNeuralNetParticleExtraction/src/mrcImageNeuralNetParticleExtraction.html
	modified:   src/Tools/pickup/mrcImageNeuralNetParticleLearning/src/mrcImageNeuralNetParticleLearning.html
	modified:   src/Tools/rec3d/CheckCommonLineData/src/CheckCommonLineData.html
	modified:   src/Tools/rec3d/CheckOfOrientation/src/CheckOfOrientation.html
	modified:   src/Tools/rec3d/CheckOrientationByDegree/src/CheckOrientationByDegree.html
	modified:   src/Tools/rec3d/CommonLineCalculation/src/CommonLineCalculation.html
	modified:   src/Tools/rec3d/LCalculationForOrientationSearch/src/LCalculationForOrientationSearch.html
	modified:   src/Tools/rec3d/ProjectionDirectionMapCreate/src/ProjectionDirectionMapCreate.html
	modified:   src/Tools/rec3d/WeightCalculationOfCommonLineSearch/src/WeightCalculationOfCommonLineSearch.html
	modified:   src/Tools/rec3d/WeightCalculationOfCommonLineSearchByAllSinogram/src/WeightCalculationOfCommonLineSearchByAllSinogram.html
	modified:   src/Tools/rec3d/calcCommonLine/src/calcCommonLine.html
	modified:   src/Tools/rec3d/commonLinesSearchByVoting/src/commonLinesSearchByVoting.html
	modified:   src/Tools/rec3d/ll2ltlg/src/ll2ltlg.html
	modified:   src/Tools/rec3d/llExtract/src/llExtract.html
	modified:   src/Tools/rec3d/llExtractCtfinfFileCreate/src/llExtractCtfinfFileCreate.html
	modified:   src/Tools/rec3d/llExtractWithLayerSeparation/src/llExtractWithLayerSeparation.html
	modified:   src/Tools/rec3d/llExtractWithLayerSeparationServer/src/llExtractWithLayerSeparationServer.html
	modified:   src/Tools/rec3d/llExtractWithLayerSeparationSingle/src/llExtractWithLayerSeparationSingle.html
	modified:   src/Tools/rec3d/ltlg2mrc/src/ltlg2mrc.html
	modified:   src/Tools/rec3d/ltlg2ps/src/ltlg2ps.html
	modified:   src/Tools/rec3d/marker2Dto3DEstimator/src/marker2Dto3DEstimator.html
	modified:   src/Tools/rec3d/mrc2DFTto3DFT/src/mrc2DFTto3DFT.html
	modified:   src/Tools/rec3d/mrc2Dto3D/src/mrc2Dto3D.html
	modified:   src/Tools/rec3d/mrc2Dto3DforVariation/src/mrc2Dto3DforVariation.html
	modified:   src/Tools/rec3d/mrc3Dto2D/src/mrc3Dto2D.html
	modified:   src/Tools/rec3d/mrc3Dto2DFFT/src/mrc3Dto2DFFT.html
	modified:   src/Tools/rec3d/mrcImageCommonLineSearch/src/mrcImageCommonLineSearch.html
	modified:   src/Tools/rec3d/mrcImageInverseRadonTransform/src/mrcImageInverseRadonTransform.html
	modified:   src/Tools/rec3d/mrcImageOrientationSearch/src/mrcImageOrientationSearch.html
	modified:   src/Tools/rec3d/mrcImageOrientationSearchByHigherSelection/src/mrcImageOrientationSearchByHigherSelection.html
	modified:   src/Tools/rec3d/mrcImageOrientationSearchByHybridization/src/mrcImageOrientationSearchByHybridization.html
	modified:   src/Tools/rec3d/mrcImageOrientationSearchBySimultaneousMinimization/src/mrcImageOrientationSearchBySimultaneousMinimization.html
	modified:   src/Tools/rec3d/mrcRadon2Dto3D/src/mrcRadon2Dto3D.html
	modified:   src/Tools/simulation/energyTransferModelCheck/src/energyTransferModelCheck.html
	modified:   src/Tools/simulation/muscleSimulation/src/muscleSimulation.html
	modified:   src/Tools/utils/anglediffchk/src/anglediffchk.html

 Changes not staged for commit:
	modified:   include/eosMATH.h