Save Frankys E-Mail account
Created gui and emails for #40 and #41; changed some locations according to comment in #120
Merge branch 'develop' into develop-js-mail
Send E-Mails, jsut need to writte Tests now
Merge branch 'develop' of https://github.com/tkowark/hpi-hiwi-portal into develop-js-mail

Conflicts:
	app/controllers/students_controller.rb
	app/models/user.rb
	config/locales/views/students/de.yml
	config/locales/views/students/en.yml
Save Frankys E-Mail account
Seed updated. Now every Job Offer has a responsible Person
Fixed some errors.
Merge branch 'develop' into develop-js-mail
refactored some stuff, start merge
Merge branch 'develop' into develop-js-mail

Conflicts:
	app/controllers/students_controller.rb
	app/mailers/job_offers_mailer.rb
	app/models/user.rb
	app/views/students/_form.html.erb
	config/locales/models/student/en.yml
	config/locales/models/user/de.yml
	db/schema.rb
	db/seeds.rb
	spec/controllers/job_offers_controller_spec.rb
	spec/factories/employer_factory.rb
	spec/factories/job_offer_factory.rb
	spec/mailers/job_offers_mailer_spec.rb
pulled from develop, to improve testquality using new factory definition
#broken Save status of this branche. Seed is broken caused by logic constraints.
Fixed the seed skript
Finaly finished #40 and #41 and merged them into current version.
also fixed some errors
Merge branch 'develop-js' of https://github.com/tkowark/hpi-hiwi-portal into develop-js-mail

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/applications.css.scss
	app/controllers/application_controller.rb
	app/controllers/chairs_controller.rb
	app/controllers/users_controller.rb
	app/views/chairs/_form.html.erb
	app/views/faqs/_form.html.erb
	app/views/job_offers/_form.html.erb
	app/views/layouts/application.html.erb
	app/views/staff/_form.html.erb
	app/views/students/_form.html.erb
	config/locales/views/layouts/de.yml
	config/locales/views/layouts/en.yml
	spec/controllers/students_controller_spec.rb
Merge branch 'develop-js-mail' into develop-js
finishing #40 and #41

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/applications.css.scss
	app/controllers/application_controller.rb
	app/controllers/faqs_controller.rb
	app/mailers/job_offers_mailer.rb
	app/views/faqs/_form.html.erb
	app/views/job_offers/_form.html.erb
	app/views/job_offers_mailer/deputy_accepted_job_offer_email.html.erb
	app/views/job_offers_mailer/deputy_accepted_job_offer_email.txt.erb
	app/views/job_offers_mailer/deputy_declined_job_offer_email.html.erb
	app/views/job_offers_mailer/deputy_declined_job_offer_email.txt.erb
	app/views/job_offers_mailer/new_job_offer_email.html.erb
	app/views/layouts/application.html.erb
	app/views/layouts/navigation/_admin.html.erb
	app/views/layouts/navigation/_chair_overview.html.erb
	app/views/staff/_form.html.erb
	app/views/students/_form.html.erb
	config/locales/mailers/job_offers_mailer/de.yml
	config/locales/mailers/job_offers_mailer/en.yml
	config/locales/models/user/de.yml
	config/locales/views/layouts/de.yml
	config/locales/views/layouts/en.yml
	db/schema.rb
	db/seeds.rb
	spec/controllers/job_offers_controller_spec.rb
	spec/mailers/job_offers_mailer_spec.rb