inital logger again
Merge branch 'master' of https://github.com/adegroot/git-for-ari.git

Conflicts:
	org.apache.log4j/log4j.properties