testing...
Merge branch 'develop-ak-approval-of-the-head-of-chair' of https://github.com/tkowark/hpi-hiwi-portal into develop-ak-approval-of-the-head-of-chair

Conflicts:
	spec/features/job_offer_pages_spec.rb