Merge branch 'develop-ja' of https://github.com/tkowark/hpi-hiwi-portal into develop-ja
Merge branch 'develop-ja' of https://github.com/tkowark/hpi-hiwi-portal into develop-ja
Merge branch 'develop-ja' of https://github.com/tkowark/hpi-hiwi-portal into develop-ja
Merge branch 'develop' into develop-ja-multiple-application-accept
Merge branch 'develop-ja' of https://github.com/tkowark/hpi-hiwi-portal into develop-ja
Merge branch 'develop' into develop-ja-multiple-application-accept
created status for test to pass, #205
removed .deputy?, because deputy is not a role, use user_is_deputy? instead, removed /new from students, staff controller, fixed test for staff edit
added test that students can not see the students index page
added test that a member of the staff can’t edit the profile of others
extended test, shows that /edit does not work on other users profiles
Multiple students can now apply for one job offer. A job offer now has the relation assigned_students and a user now has the relation assigned_job_offers. Remove the attribute assigned_student_id from user, since now not only one student can be assigned. Modified the emails when jobs are accepted / closed, since they only contained one assigned student. Modified the tests that only worked with one assigned student. #202
Merge branch 'develop-ja-multiple-application-accept' into develop-ja
Modified applications test, since the tests were written on old assumption that only one student can be assigned to a job offer. Added application seeds for testing purpose #202
Merge branch 'develop-ja-multiple-application-accept' into develop-ja
Merge branch 'develop-ja' of https://github.com/tkowark/hpi-hiwi-portal into develop-ja
show assigned students on job offers page #200
for staff and the student himself it shows the assigned job offers on the students profile #109
#199 removed escape_javascript to fix text editor
Merge remote-tracking branch 'origin/develop-ja' into develop-ja-text-editor

Conflicts:
	app/views/chairs/_chair.html.erb