Merge remote-tracking branch 'origin/master'

# Conflicts:
#	css/style.css
#	ert-custom-recent-posts.php
#	images/yok.png
#	include/widgets.php
