Replaced CodeModel sources with the stock .jar files. There was one
modification, removing some "clever" checks in JConditional that I think
broke it at one point, but seem to be working now.
Merge branch 'master' into stock_cm