removed external #347
adapted seeds so that HPI is one Employer #347
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