Merge branch 'master' of git.osdn.jp:/gitroot/eos/base

Merge branch 'master' of git.osdn.jp:/gitroot/eos/base

 Conflicts:
	src/Tools/crystal/crystalGetLatticeVolume/src/crystalGetLatticeVolume.html
	src/Tools/crystal/crystalGetReciprocalLattice/src/crystalGetReciprocalLattice.html
	src/Tools/llData/llDataPrint/src/llDataPrint.html
	src/Tools/mrcImage/mrcImageChainCodeCalc/src/mrcImageChainCodeCalc.html
	src/Tools/mrcImage/mrcImageCrystalDeform/src/mrcImageCrystalDeform.html
	src/Tools/mrcImage/mrcImageFeatureCalc/src/mrcImageFeatureCalc.html
	src/Tools/mrcImage/mrcImagePerimeterCalc/src/mrcImagePerimeterCalc.html
	src/Tools/mrcImage/mrcImageSurfaceAreaCalc/src/mrcImageSurfaceAreaCalc.html

 It looks like you may be committing a merge.
 If this is not correct, please remove the file
	.git/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 1 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:   include/eosMath.h
	modified:   src/Objects/General/eosMath/doc/eosMath.html
	new file:   src/Objects/General/eosMath/src/X86LINUX64
	new file:   src/Tools/crystal/crystalGetLatticeVolume/src/X86LINUX64
	modified:   src/Tools/crystal/crystalGetLatticeVolume/src/crystalGetLatticeVolume.html
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/src/X86LINUX64
	modified:   src/Tools/crystal/crystalGetReciprocalLattice/src/crystalGetReciprocalLattice.html
	new file:   src/Tools/eosMath/eosMathAverage/src/X86LINUX64
	new file:   src/Tools/eosMath/eosMathMedian/src/X86LINUX64
	new file:   src/Tools/eosMath/eosMathSorting/src/X86LINUX64
	modified:   src/Tools/llData/llDataPrint/src/llDataPrint.html
	modified:   src/Tools/mrcImage/mrcImageChainCodeCalc/src/mrcImageChainCodeCalc.html
	new file:   src/Tools/mrcImage/mrcImageCrystalDeform/src/X86LINUX64
	modified:   src/Tools/mrcImage/mrcImageCrystalDeform/src/mrcImageCrystalDeform.html
	modified:   src/Tools/mrcImage/mrcImageFeatureCalc/src/mrcImageFeatureCalc.html
	modified:   src/Tools/mrcImage/mrcImagePerimeterCalc/src/mrcImagePerimeterCalc.html
	modified:   src/Tools/mrcImage/mrcImageSurfaceAreaCalc/src/mrcImageSurfaceAreaCalc.html