Merge branch 'master' of github.com:neradis/index-vivus
Merge branch 'master' of github.com:neradis/index-vivus
added test data for Pape (dev and test)
* added constant for abbreviation tag to be used at import
Merge branch 'xmlimport'
Merge branch 'xmlimport' of https://github.com/neradis/index-vivus into xmlimport
added abbreviation support for PapeImporter
* special cases included (line breaks in abbreviation meanings etc.)
improved line break detection for abbreviations with meanings with more than one <p>
* false positive detection for content errors (missing dot at the end of a line)
improved info output
* removed debug statements
* fixed minor bugs in abbr-detection
~
Merge branch 'xmlimport'
updates for some test cases
Added gitignore for gem cache dir
Merge branch 'master' into frontend

Conflicts:
	backend/src/main/java/de/fusionfactory/index_vivus/configuration/SettingsProvider.java
	backend/src/main/java/de/fusionfactory/index_vivus/indexer/Indexer.java
	backend/src/main/java/de/fusionfactory/index_vivus/testing/fixtures/FixtureData.java
added test data for Pape (dev and test)
* added constant for abbreviation tag to be used at import
added abbreviation support for PapeImporter
* special cases included (line breaks in abbreviation meanings etc.)
improved line break detection for abbreviations with meanings with more than one <p>
* false positive detection for content errors (missing dot at the end of a line)
improved info output
* removed debug statements
* fixed minor bugs in abbr-detection
~
Merge remote-tracking branch 'remotes/origin/master'
Merge branch 'master' into frontend

Conflicts:
	backend/src/main/java/de/fusionfactory/index_vivus/configuration/SettingsProvider.java
	backend/src/main/java/de/fusionfactory/index_vivus/indexer/Indexer.java
	backend/src/main/java/de/fusionfactory/index_vivus/testing/fixtures/FixtureData.java