aa
sd
Merge branch 'master' of https://github.com/webcainternet/dmj2

Conflicts:
	public/wp-content/themes/theme1983/favicon.ico