Dev to Master

merges sorting fixes and lucene/multiedit fixes