#326 integrated styles, javascripts and main template from new website templates
#326 hack for navbar implemented
#324 job offer pages working

increased job offer pagination to 15 job offers per page
#324 continued integrating new layout.
Merge remote-tracking branch 'origin/develop' into new-homepage

Conflicts:
	app/views/devise/sessions/new.html.erb
	app/views/layouts/application.html.erb
	app/views/staff/index.html.erb
	app/views/students/index.html.erb
	app/views/students/show.html.erb
	config/routes.rb
	spec/controllers/home_controller_spec.rb
continued work -.- #326
Merge remote-tracking branch 'origin/develop' into new-homepage

Conflicts:
	Gemfile.lock
	app/views/students/show.html.erb
	config/routes.rb
adapted all sites to new design #324
implemented logout button #326
readied flash messages
removed external #347
adapted seeds so that HPI is one Employer #347
deactivated test subjects
Merge pull request #363 from hpi-swt2/feature/activation

Feature/activation
Merge remote-tracking branch 'origin/develop' into new-homepage

Conflicts:
	app/views/employers/index.html.erb
	app/views/employers/show.html.erb
	app/views/layouts/application.html.erb
Merge pull request #366 from hpi-swt2/new-homepage

New Design adaption
Merge remote-tracking branch 'origin/develop' into feature/remove-external

Conflicts:
	app/controllers/employers_controller.rb
	app/models/employer.rb
	app/views/employers/_employer.html.erb
	app/views/employers/index.html.erb
	app/views/employers/show.html.erb
	app/views/layouts/navigation/_admin.html.erb
	config/locales/views/employers/de.yml
	config/locales/views/employers/en.yml
	config/routes.rb
fixed merge
Merge pull request #368 from hpi-swt2/feature/remove-external

Feature/remove external
Merge branch 'develop' into feature/deployment