update
Merge origin/master
update
Merge origin/master

Conflicts:
	include/common-sidebar.php
Merge origin/master
suggestions from stakeholders