Merge branch 'master' of https://github.com/IVPR/Weave into foo
added support for OR AND query processing
merge foo_query_processing and fix conflicts