adding emma
Merge branch 'master' of https://github.com/n3phele/core

Conflicts:
	n3phele/test/n3phele/AllUnitTests.java