sidebar-widget
Merge remote-tracking branch 'origin/master'

Conflicts:
	sidebar-right.php
Merge branch 'master' of https://github.com/Ghebrehiwet/waybackintheme