Merge pull request #65 from erwinwinder/master

Bug fixes
Merge pull request #66 from erwinwinder/master

 	Add databasefactory
add questionnaire matrix parser, use during omx conversion
use maven resources plugin
fix HTML warnings
fix label underline issue
Merge pull request #69 from dennishendriksen/master

LL questionnaire matrix parser + pom fix
added mvc test package
Merge branch 'master' of https://github.com/molgenis/molgenis into mvc
first implementation of Query, QueryFactory, QueryService interfaces
Solr demo
Elastic search
SearchService impl