^ update isAdmin for renderMenu
Merge remote-tracking branch 'origin/1.4' into 1.4

Conflicts:
	plugins/system/zo2/libraries/megamenu.php
Merge remote-tracking branch 'origin/1.4' into 1.4

Conflicts:
	plugins/system/zo2/libraries/megamenu.php