- german translations for employers home
- englisch translations for employers home
 #431_Translate_Employers_Home_Page_in_English
Merge branch 'develop' into #431_Translate_Employers_Home_Page_in_English
corrected mistake in language mappings
learned to leave whitespace between tag and content
#431_Translate_Employers_Home_Page_in_English
- fixed translations for german and english, so that html could transferred for link_to and mail_to
- implemented translations in view
#431_Translate_Employers_Home_Page_in_English
removed room number from translations

#439_remove_program_and_room_number
migration for removing column room_number for job offers
#439_remove_program_and_room_number
removed room_number from specs
#439_remove_program_and_room_number
removed room_number from views
#439_remove_program_and_room_number
removed room_number from job_offer model
#439_remove_program_and_room_number
removed room number from email
#439_remove_program_and_room_number
removed_room_number from job offer controller
#439_remove_program_and_room_number
removed room number from job offer factory and schema
#439_remove_program_and_room_number
migration for removing academic_program_id from job offer model
#439_remove_program_and_room_number
removed academic program id from job offer views
#439_remove_program_and_room_number
removed academic program id from job offer model
#439_remove_program_and_room_number
removed academic program from job offer controller, factory and specs
#439_remove_program_and_room_number
Merge branch 'develop' into #431_Translate_Employers_Home_Page_in_English

Conflicts:
	config/locales/views/employers/de.yml
	config/locales/views/employers/en.yml
Merge branch 'develop' into #439_remove_program_and_room_number

Conflicts:
	db/schema.rb
Merge pull request #453 from hpi-swt2/#431_Translate_Employers_Home_Page_in_English

#431 translate employers home page in english
Merge pull request #455 from hpi-swt2/#439_remove_program_and_room_number

#439 remove program and room number