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