Improved handling of menu item types
Merge remote-tracking branch 'origin/1.5-develop' into 1.5-develop

Conflicts:
	helper.php
Improved handling of menu item types