solr plugged in
merging
Merge branch 'master' of https://github.com/pdendek/docsim-oap-demo

Conflicts:
	src/main/java/pl/edu/icm/coansys/webdemo/service/CitationMatchingService.java
	src/main/java/pl/edu/icm/coansys/webdemo/service/ParsingService.java