Avance beta
change
Merge remote-tracking branch 'origin/FdoSilva' into FdoSilva

Conflicts:
	wp-config.php