Fixed merge conflicts

Conflicts:
	Facts/Infrastructure/LuceneSearchServiceFacts.cs
	Website/Infrastructure/Lucene/LuceneIndexingJob.cs
	Website/Infrastructure/Lucene/LuceneIndexingService.cs