Conflicts:
	src/main/java/edu/cornell/kfs/gl/batch/dataaccess/impl/CuLedgerEntryBalanceCachingDaoJdbc.java

removal of methods that were not customized
resolved conflict, removing methods that were not modified