lalala
Merge branch 'master' of https://github.com/raphael0914/Lucene.git
temp
Merge branch 'master' of https://github.com/raphael0914/Lucene.git

Conflicts:
	lucene/core/src/java/org/apache/lucene/search/HighlightAdapter.java
Merge branch 'master' of https://github.com/raphael0914/Lucene

Conflicts:
	lucene/core/src/java/org/apache/lucene/search/HighlightAdapter.java