burning the midnight oil like a motherfucker
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/SearchController.php