* refactored JobStatus
Merge remote-tracking branch 'origin/develop' into develop-ak

Conflicts:
	app/controllers/job_offers_controller.rb
	app/models/job_offer.rb
Merge branch 'develop' of https://github.com/tkowark/hpi-hiwi-portal into develop