24 running tests
added job_offers to detailed chair page #51
#broken
#broken
merged user.rb and student.rb in one table.
- missing adapting tests
- missing adapting student serach
- missing fixin all the links
Merge remote-tracking branch 'origin/develop' into develop-ja-chairs-detailed-page

Conflicts:
	app/views/chairs/show.html.erb
refactored search_filter_sort form
New Joboffer Button inline with Headline
added jobOffer lists to detailed chair page, tests not green [ci skip]  #51

+ lot of refactoring
Merge branch 'develop-ja-chairs-detailed-page' of https://github.com/tkowark/hpi-hiwi-portal into develop-ja-chairs-detailed-page

Conflicts:
	app/views/job_offers/index.html.erb
fixed job_offer_controller and job_offer_view tests, #53
jobs can now be closed by a research assistent (#66)
* added model for job status (simpler solution than maintaining string symbols in the db)
* fixed some issues with spec tests
* fixed bugs
* fixed translation issues
Merge remote-tracking branch 'origin/develop' into develop-ak

Conflicts:
	app/models/job_offer.rb
	app/views/job_offers/_form.html.erb
	app/views/job_offers/show.html.erb
	config/locales/views/job_offers/de.yml
	config/locales/views/job_offers/en.yml
	config/routes.rb
	spec/controllers/job_offers_controller_spec.rb
Merge branch 'master' of https://github.com/tkowark/hpi-hiwi-portal
added a new test for job offer completion
tests for #59
Editing Chairs for admins, including changing the deputy
implementation for #59
Merge branch 'develop-ak-accept-student' into develop-ak