Cleaned up comparator render.
Torch on AND Cell shortened
Fixed build.xml to include $1.class files generated during reobfuscation
Merge remote-tracking branch 'upstream/master'