add log4php xml to gitignore
Merge dev
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master' into dev
Revert "custom service login form"

This reverts commit da49e2bca7021fa648f738b5ba6784403125114b.
custom service login form