fixing tests
fixing tests
moved the tests
ignore masters and slaves files
itMerge branch 'mark' into dev

Conflicts:
	freeeed-processing/src/test/java/org/freeeed/main/EmlFileProcessorTest.java
config file - not clear why the disappeared
resolving conflicts