Some more clean up and documenting on ConflictDaemon.java
Some more clean up and documenting on ConflictDaemon.java

KaranDagar/crystalvc,brunyuriy/crystalvc,SoftwareEngineeringToolDemos/FSE-2011-Crystal,KaranDagar/FSE-2011-Crystal---old,KaranDagar/crystalvc,SoftwareEngineeringToolDemos/FSE-2011-Crystal,KaranDagar/FSE-2011-Crystal---old,brunyuriy/crystalvc,SoftwareEngineeringToolDemos/FSE-2011-Crystal