Change statement log level
complete search in ontology tree javascript
added ontology tree to ontologyservice
added error handling and sort the nodes alphabitically
Merge pull request #1591 from mswertz/2014_03_22_data_mysql

added Queryable.query, examples module and removed (docs are now on wiki)
Omx 2 emx conversion and refactor
Merge branch 'master' of https://github.com/molgenis/molgenis into omx2emx-converter

Conflicts:
	molgenis-data-mysql/src/main/java/org/molgenis/data/mysql/MysqlRepository.java
	molgenis-data/src/main/java/org/molgenis/data/support/AbstractCrudRepository.java
Merge branch 'master' of https://github.com/molgenis/molgenis
Fix #1614 Study manager filtering broken after state change in manage col
Merge pull request #1615 from dennishendriksen/master

Fix #1614 Study manager state change through manage tab broken
Fix #1508 #1574 #1607 #1608 Use non-analyzed field for aggregation
Merge pull request #1616 from dennishendriksen/master

Fix #1508 #1574 #1607 #1608 Use non-analyzed field for aggregation
Fix #1606 Counts are not correct in the aggregate view
Test foiFix #1606 Counts are not correct in the aggregate view
Merge pull request #1617 from dennishendriksen/master

Fix #1606 Counts are not correct in the aggregate view
Fix test (did not take into account col sort order)
Merge pull request #1618 from dennishendriksen/master

Fix test (did not take into account col sort order)
Fix #1612 Entity description in dataexplorer
Merge pull request #1619 from dennishendriksen/master

Fix #1612 Entity description in dataexplorer
Sort tree preview same as loaded tree