Directory
Merge branch 'master' of https://github.com/angoca/log4db2

Conflicts:
	.travis.yml
Recovered