Refactoring
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	app/code/community/Hackathon/Layeredlanding/Model/Options/Categories.php