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

Conflicts:
	.jCodeCollector/jCodeCollector/JCODECOLLECTOR_DB/db.lck
	.jCodeCollector/jCodeCollector/JCODECOLLECTOR_DB/log/log1.dat
	.jCodeCollector/settings
	programs/jCodeCollector/derby.log