Merge pull request #1 from viteke/master

pull lucene changes
Merge https://github.com/arago/rike
remove json-simple dependency
merge
Merge pull request #15 from p1tz/master

merge