added bundle as retrieve type for ivy so that it will include log4j jars
Merge branch 'master' into devel