Changed navigation handling
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	app/code/community/Hackathon/Layeredlanding/etc/config.xml
	app/design/frontend/base/default/layout/layeredlanding.xml