removed derby.log and .cache from git
Merge branch 'master' of https://github.com/NEO-IE/MultirExperiments

Conflicts:
	.gitignore