added first version of the filter wizard
Merge branch 'master' of https://github.com/molgenis/molgenis
fixed a bug in ontology-annotator.js
Merge branch 'master' of https://github.com/molgenis/molgenis into work
Merge branch 'master' of https://github.com/molgenis/molgenis into work
added forward slash as escape characters
Merge branch 'master' of https://github.com/molgenis/molgenis into work
added a new mesh term to mesh owl ontology
Merge branch 'master' of https://github.com/molgenis/molgenis into work
fix merge
fix merge 2
fix merge
Merge pull request #928 from ChaoPang/work

Added forward slashes to escape characters in ElasticSearch Lucendtringbuilder
added pipe character in LuceneStringQueryTest.java
Merge branch 'master' of https://github.com/molgenis/molgenis into work
fixed the escaped characters in the comment
Merge pull request #929 from ChaoPang/work

Fixed the elasticsearch escaped characters
the filter wizard is now working
removed wizard from protocolmanager
fixing some comments