Added cache tag again
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	app/design/frontend/base/default/layout/layeredlanding.xml