Merge branch 'master' of github.com:aeten/core

Conflicts:
	.gitignore
	README
	build.xml
	src/net.aeten.core/net/aeten/core/spi/ProviderProcessor.java
	src/org.slf4j