Merge branch 'master' of https://github.com/vdu/eMitExp

Conflicts:
	.DS_Store
	bin/eMitExp.app/Contents/MacOS/eMitExp
test6