Split Msc and Bsc education, add Solr to expertise and reword some parts