#80 Student index just visible for wimis (and admins)
Merge branch 'develop-js' of github.com:tkowark/hpi-hiwi-portal into develop-js
fixed tests related to visibility issue
implemented tests for permissions
Merge branch 'develop-js' of github.com:tkowark/hpi-hiwi-portal into develop-js

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/students_controller.rb
more tests for permissions
Revert "more tests for permissions"

This reverts commit 4169fc807e7516387d15022f7307afcc49040363.
Revert "Merge branch 'develop-js' of github.com:tkowark/hpi-hiwi-portal into develop-js"

This reverts commit b9f77af1419e795287b1a5945a4a9b242c255166, reversing
changes made to 9ba482b81ec571f5c3c3c6212b45fe91b9f816f6.
Revert "implemented tests for permissions"

This reverts commit 9ba482b81ec571f5c3c3c6212b45fe91b9f816f6.
Revert "fixed tests related to visibility issue"

This reverts commit d3a61847ae92501456d14afe4323a4c56cf322ed.
Revert "#80 Student index just visible for wimis (and admins)"

This reverts commit 7c3991ace250745c07a04df72b801731c88f00d5.
#92 completed description of chair Verwaltung
#82 fixed input range of semester input
Merge branch 'develop-js' into develop

Conflicts:
	app/controllers/staff_controller.rb
	app/controllers/students_controller.rb
	app/helpers/users_helper.rb
	app/views/job_offers/show.html.erb
	app/views/research_assistants/edit.html.erb
	app/views/staff/index.html.erb
	config/locales/views/students/de.yml
	config/locales/views/students/en.yml
	config/locales/views/users/de.yml
	config/locales/views/users/en.yml
	spec/controllers/research_assistants_controller_spec.rb
	spec/controllers/users_controller_spec.rb
Merge branch 'develop' of github.com:tkowark/hpi-hiwi-portal into develop

Conflicts:
	config/locales/views/students/de.yml
Merge branch 'develop'