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

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

 Conflicts:
	src/Tools/Config/Define.inc
	src/Tools/filter/mrc2hdf/src/mrc2hdf.c

 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 17 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:
	modified:   bin/wish/Display2/tclIndex
	modified:   include/lmrcImageProjection.h
	modified:   src/Objects/DataManip/mrcImage/src/lmrcImageProjection.c
	modified:   src/Objects/DataManip/mrcImage/src/lmrcImageProjection.h
	deleted:    src/Objects/Makefile.org
	modified:   src/Tools/Config/Define.inc
	deleted:    src/Tools/Config/Define.inc.org
	deleted:    src/Tools/Config/Define.inc.orig
	modified:   src/Tools/filter/mrc2hdf/src/mrc2hdf.c
	modified:   src/Tools/filter/mrc2hdf/src/test/Makefile
	new file:   src/Tools/mrcImage/mrcImageLucasKanade/src/ALPHA
	new file:   src/Tools/mrcImage/mrcImageLucasKanade/src/ALPHALINUX
	new file:   src/Tools/mrcImage/mrcImageLucasKanade/src/ALPHALINUX5
	new file:   src/Tools/mrcImage/mrcImageLucasKanade/src/ALPHAOSF1
	new file:   src/Tools/mrcImage/mrcImageLucasKanade/src/CELLLINUX64
	new file:   src/Tools/mrcImage/mrcImageLucasKanade/src/HP
	new file:   src/Tools/mrcImage/mrcImageLucasKanade/src/I386LINUX
	new file:   src/Tools/mrcImage/mrcImageLucasKanade/src/I686LINUX
	new file:   src/Tools/mrcImage/mrcImageLucasKanade/src/SGI
	new file:   src/Tools/mrcImage/mrcImageLucasKanade/src/SPARC
	new file:   src/Tools/mrcImage/mrcImageLucasKanade/src/X86MAC64