Merge of the filtered search project into master
Versioning