Added fufufu link
Added counts to image search page
Merge branch 'master' into christmas

Conflicts:
	app/controllers/SearchController.php