Merge remote-tracking branch 'origin/master' into develop
Merge branch 'develop' of https://github.com/tkowark/hpi-hiwi-portal into develop
#147 promotion of student to staff with dialog and confirmation
add form and change mailer for #144
wrapped programming languages and languages in accordion element #103 D
fixed bug with programming languages and languages.
changed studentsearch to be a template which is rendered into the index
removed studentsearch test, due to the page being removed
refactored studentsearch to use has_scope
small layout change to job_offers in response to 103 A1
#103
removed footer from dialog
#147 deputy can promote student to deputy
Merge branch 'develop-ja-aquire-role' of https://github.com/tkowark/hpi-hiwi-portal into develop-ja-aquire-role
small layout change for the checkboxes
refactored research_assistant_controller a little + some tests
added two users_controller tests
adjusted some tests
removed unused student factory
made user factory a little more robust regarding status objects
made helper spec a little more flexible. Translation behaviour seems indeed a bit off between programming_language and language
more tests + refactorings, including #165 and #166
implemented application cancelation for #156
Merge remote-tracking branch 'origin/develop' into develop-ja

Conflicts:
	app/models/user.rb