AEE7 added.  with no mistakes.  dammit dima.
Merge commit '92b3aee03353560ee9ad01390f3ae755d38bb84b'

Conflicts:
	src/scppdap/bafcsv/lib/JournalWriterUser.java

Suck it dima.