commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	header/_user-details.php
	header/menu-top-navigation.php