Adding log4j binding to slf4j.
Merge branch 'master' into dom4j

* master:
  Adding log4j binding to slf4j.

Conflicts:
	pom.xml