Merge branch 'develop-ja' of https://github.com/tkowark/hpi-hiwi-portal into develop-ja
Merge branch 'develop-ja' of https://github.com/tkowark/hpi-hiwi-portal into develop-ja
removed unnecessary controller methods
removed unnecessary controller methods #2
refactored update_from_params_for_languages
Revert "Merge branch 'develop-js' into develop"

This reverts commit 8af93f875b03522d5bc2eb775e2c2aea19726e57, reversing
changes made to 44e8b108fff47da23cd674522092cd5703e17251.

Conflicts:
	config/locales/views/students/de.yml
Merge branch 'develop-ja' of https://github.com/tkowark/hpi-hiwi-portal into develop-ja
Merge branch 'develop' into develop-ja-multiple-application-accept
sort staff by last_name, first_name, added acceptance test for staff page, #161
removed student search controller, functionality is in the box on the students index page
removed duplicate user_is_admin?
sort chairs by name #161
made all listings similar to job offer pages #161, removed description of chair page on listing
chairs editable by members of chair  #188
Merge remote-tracking branch 'origin/develop-fix' into develop-ak
merged missing commits back into game. yeah
Merge branch 'develop' of https://github.com/tkowark/hpi-hiwi-portal into develop-ak
Merge pull request #197 from tkowark/develop-ak

Refactorings
testworkaround #205
Merge remote-tracking branch 'origin/develop' into develop-ja-listing-ui

Conflicts:
	app/views/students/index.html.erb