merge
Merge branch 'other'

Conflicts:
	protected/extensions/userMenu/views/index.php