miron jutut
Merge branch 'master' of https://github.com/jazu/tikkusoftwares2

Conflicts:
	derby.log
	tikkudb/db.lck
	tikkudb/log/log.ctrl
	tikkudb/log/log1.dat
	tikkudb/log/logmirror.ctrl
	tikkudb/seg0/c90.dat