Merge remote-tracking branch 'origin/master' into develop
Merge pull request #154 from tkowark/develop

Merging develop into master to fix production errors
Merge remote-tracking branch 'origin/develop'
Merge branch 'develop' of https://github.com/tkowark/hpi-hiwi-portal
Merge branch 'develop' of https://github.com/tkowark/hpi-hiwi-portal
Merge branch 'develop' of https://github.com/tkowark/hpi-hiwi-portal into develop
#147 promotion of student to staff with dialog and confirmation
Merge pull request #163 from tkowark/develop

Refactorings + Improvements
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
Merge remote-tracking branch 'origin/develop' into develop-ja

Conflicts:
	app/models/user.rb
started to enforce roles #75

detail:
admin now can do everything on the job offers show page
all staff members of the chair can edit/update/destroy job_offers
only the responsible user can accept applications (adapted tests in job_offer_pages_spec for that)
only staff members + admins can create job offers, students can’t
you can only edit your own profile (+ test), an admin can edit every profile #75
students can’t create job offers via “/new” url parameter anymore