ending
fixing merge conflicts
Merge branch 'master' of https://github.com/jeromeheissler/indexing-engine-mapreduce