#
Merge branch 'master' of https://github.com/gqueste/eventManager.git

Conflicts:
	ddb/eventManagerDB_v2_Derby10.9/bin/derby.log
	ddb/eventManagerDB_v2_Derby10.9/bin/eventManager/db.lck
	ddb/eventManagerDB_v2_Derby10.9/bin/eventManager/log/log.ctrl
	ddb/eventManagerDB_v2_Derby10.9/bin/eventManager/log/log2.dat
	ddb/eventManagerDB_v2_Derby10.9/bin/eventManager/log/logmirror.ctrl
	ddb/eventManagerDB_v2_Derby10.9/bin/eventManager/seg0/c11d0.dat
	ddb/eventManagerDB_v2_Derby10.9/bin/eventManager/seg0/c11e1.dat
	ddb/eventManagerDB_v2_Derby10.9/bin/eventManager/seg0/c11f1.dat
	ddb/eventManagerDB_v2_Derby10.9/bin/eventManager/seg0/c90.dat
Merge branch 'master' of https://github.com/gqueste/eventManager.git