make the files more comparable by fixing whitespace differences
% code cleanup
% java5 fix
import cleanup
mvn source plugin update
+ more tests
ups