Revert "Revert "potato"" "Revert"

This reverts commit 3577eefc5d1e13ca9f19df780537aa523a3c56ef.

Conflicts:
	readme.html
	wp-admin/about.php
	wp-content/languages/admin-pt_BR.mo
	wp-content/languages/admin-pt_BR.po
	wp-content/themes/ElegantFusion/footer.php
	wp-content/themes/ElegantFusion/functions.php
	wp-content/themes/ElegantFusion/images/bg_fusion.jpg
	wp-content/themes/ElegantFusion/images/logo.png
	wp-content/themes/ElegantFusion/style.css
	wp-includes/ID3/getid3.lib.php
	wp-includes/class-IXR.php
	wp-includes/class-wp-customize-widgets.php
	wp-includes/compat.php
	wp-includes/pluggable.php
	wp-includes/version.php
	wp-login.php
Revert "Revert "Revert "potato"" "Revert""

This reverts commit 8d8c48d01dbd735c35fa0c4a8f260d2a55844ba6.
Merge remote-tracking branch 'origin/master'