Add missing Solr config files
Put things in the right place for Solr
Use 3.3.0-SNAPSHOT build of Marmotta