add log4php xml to gitignore
Merge branch 'dev'