backend extensions for issue #35
adjusted mock to changes in IKeywordSearchService; add new action for Ajax controller; apply several changed from the frontend branch
added route to new AjaxController action get_matches_with_alternative
Merge branch 'frontend' into issue/35

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
	frontend/railsapp/app/controllers/ajax_controller.rb
Merge branch 'frontend' into issue/35
Two minor fixes in AjaxController (incomplete parameter list and missing Java import)

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
	frontend/railsapp/app/controllers/ajax_controller.rb
updates for some test cases
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
merging in fixes from master
Merge branch 'frontend' into issue/35
simplified siganture for get_matches_with_alternative
* method siganture simplified; adjusted controller action
* deleted KeywordSearchServiceMock (not used since a while)
deactivated preservation of <abbr> tags in the description fields
removed unused classes and database table
* AbbreviationsOccurrences not needed since we decided to remember the whole abbreviation list client side
* removed logic to save abbreviation occurences in Importer
* removed unused KeywordSearchServiceMock
Merge branch 'issue/35' into xmlimport

Conflicts:
	backend/src/main/java/de/fusionfactory/index_vivus/models/scalaimpl/DictionaryEntry.scala