jcollector
jcollector
Merge branch 'master' of https://github.com/taitooz/environment

Conflicts:
	.jCodeCollector/jCodeCollector/JCODECOLLECTOR_DB/db.lck
	.jCodeCollector/jCodeCollector/JCODECOLLECTOR_DB/log/log.ctrl
	.jCodeCollector/jCodeCollector/JCODECOLLECTOR_DB/log/log1.dat
	.jCodeCollector/jCodeCollector/JCODECOLLECTOR_DB/log/logmirror.ctrl
	.jCodeCollector/jCodeCollector/JCODECOLLECTOR_DB/seg0/c3c0.dat
	.jCodeCollector/jCodeCollector/JCODECOLLECTOR_DB/seg0/c60.dat
	.jCodeCollector/jCodeCollector/JCODECOLLECTOR_DB/seg0/c81.dat
	.jCodeCollector/settings
	programs/jCodeCollector/derby.log
	programs/jCodeCollector/nohup.out