Logo bg
Merge branch 'master' of https://github.com/webcainternet/dmj2

Conflicts:
	public/wp-config.php