changes from debuging with Andy
Merge remote-tracking branch 'origin/moar_efficient' into moar_efficient

Conflicts:
	app/code/community/Jirafe/Analytics/Model/Category.php