These files have to be deleted later
Merge branch 'master' of https://github.com/pasmod/etm

Conflicts:
	EML/.settings/org.eclipse.jdt.core.prefs