changed dbdataconfig
added some files
conflict
started connecting own solr instance to ui