first design changes
testfixes
Merge remote-tracking branch 'origin/develop' into feature/text-editor-formatting

Conflicts:
	spec/features/job_offers_spec.rb
Merge pull request #434 from hpi-swt2/feature/text-editor-formatting

Feature/text editor formatting
Merge remote-tracking branch 'origin/develop' into feature/small-improvements

Conflicts:
	app/views/job_offers/show.html.erb