added test for updating staff to deputy on employers page
implemented logic for update of staff member to deputy
added promote button to employer detail page to promote a staff member to deputy
#162 started to improve promotion dialog UI
Merge remote-tracking branch 'origin/develop-js' into develop-js-mail
#162 made promote dialog for students index prettier
#169 adapted rest promote/demote dialogs
#162 translated all promotion/demotion stuff to german
fixed demote bug
Merge branch 'develop-ja-promote-staff-to-deputy' of https://github.com/tkowark/hpi-hiwi-portal into develop-ja-promote-staff-to-deputy
#240 added security checks, and improved test coverage
#307 added github comments
Merge pull request #306 from tkowark/develop-ak

Final Sprint Develop-AK
changed the grey to the desired grey #288
Merge remote-tracking branch 'origin/develop-ak' into develop
#162 little fixes
#162 fixed some bugs
Merge remote branch 'origin/develop' into develop-ja

Conflicts:
	app/controllers/users_controller.rb
Merge pull request #307 from tkowark/develop-ja

#240 added security checks, and improved test coverage
fixed translaton