log4php added.
Merge branch 'master' of D:\clouds\Dropbox\eurekaa\repositories\edijson_php

Conflicts:
	.idea/workspace.xml