hacks with freebase
Merge remote-tracking branch 'origin/suggestion-spike' into suggestion-spike

Conflicts:
	extensions/wikia/JJVideoSpike/JJVideoSpikeController.php