small layout change for the checkboxes
students can’t view the overview of students and research assistants, #75
Merge branch 'develop-ja-sort-search-filter' into develop-ja
Merge remote-tracking branch 'origin/develop' into develop-ja

Conflicts:
	config/locales/views/students/de.yml
	config/locales/views/students/en.yml
adapted chairs listing to design guideline, added pagination #111
renames "research_assistant" to "staff"

(NOTE you now have to use "staff_index_path" to get to the staff index page)
adapt chairs show to UI guideline #111
redesigned chair edit page, added some missing translations, #111
fixes for natural language translation to work again (no idea why they got changed in the first place) #100
  - adjusted seeds
  - added translation for labels on student show page
  - decapitalized languages in tests in order to be cohesive (lower case bc of translation lookup)
  - removed duplicate declaration of "english" in user_spec
removes accidentally commited backup files for vagrant
added some test cases for role specific behaviour on job offers show pages #75
Merge branch 'develop-ja-enforce-roles' of https://github.com/tkowark/hpi-hiwi-portal into develop-ja-enforce-roles
Merge remote-tracking branch 'origin/develop-ja' into develop-ja-enforce-roles

Conflicts:
	app/controllers/staff_controller.rb
	app/helpers/users_helper.rb
	app/views/research_assistants/edit.html.erb
	app/views/staff/_form.html.erb
	app/views/staff/index.html.erb
	app/views/staff/show.html.erb
	spec/controllers/research_assistants_controller_spec.rb
	spec/controllers/users_controller_spec.rb
admins can view students overview and staff overview, staff can only view the students overview #75
if you applied as a student but switched to staff afterwards the user link in the job applications list now points to the correct staff page, if you're admin and no longer got a profile the row is non clickable #75