added new attributes
added new employer fields
moved number_of_employees possibilities from view to model
removed head from employer #369
Merge remote-tracking branch 'origin/develop' into feature/employer-profile

Conflicts:
	db/schema.rb
employer index page visible #344
employer index visible #344
added full_name method for deputy
Merge pull request #386 from hpi-swt2/feature/employer-profile

Feature/employer profile
Removed matching method and redundant code #388
Fixed test #388
removed blank line
fixed rest
fixed translation
fixed german translation
Merge remote-tracking branch 'origin/develop' into feature/matching

Conflicts:
	db/schema.rb
Merge pull request #388 from hpi-swt2/feature/matching

Feature/matching
Merge branch 'develop' into feature/non-login

Conflicts:
	app/controllers/employers_controller.rb