#195 done Enhancement
#184 Made first/lastname immutable in the _form, since this was changed back by some refactoring in #111
#187 Added asterisks and conditional description
- reworked the navbar #189
- some minor changes
Merge branch 'develop-js' of github.com:tkowark/hpi-hiwi-portal into develop-js

Conflicts:
	app/controllers/students_controller.rb
fixed cv link for student
link is now extended to filename
#185 Made enhancement + fixed a student routing test
Merge pull request #227 from tkowark/develop-ak

Simple Forms Refactoring
Merge remote-tracking branch 'origin/develop-ak' into develop
reverted @jaheba's commit for the navbar #189 since it's not completed and tested, but blocks other development
Finally merged the develop branch into our develop-js (without the navbar changes of @jaheba #189)

Merge branch 'develop' into develop-js

Conflicts:
	app/assets/stylesheets/applications.css.scss
	app/controllers/application_controller.rb
	app/controllers/chairs_controller.rb
	app/views/chairs/_form.html.erb
	app/views/faqs/_form.html.erb
	app/views/job_offers/_form.html.erb
	app/views/languages/_form.html.erb
	app/views/programming_languages/_form.html.erb
	app/views/staff/_form.html.erb
	app/views/students/_form.html.erb
	app/views/user_statuses/_form.html.erb
	config/locales/views/layouts/de.yml
	config/locales/views/layouts/en.yml
	spec/controllers/students_controller_spec.rb
corrected panels and asterisk info on several forms & centered footer
fixed header translation of staff
the user status is grey, the edit button is in the right upper corner, added a star description, education and academic program are dropdowns now #184
adapted the recommendations from @scriptedSheep and @irruputuncu :)
fixed missing "R"
hopefully the last change for the pull request ;)
fixed missing characters in German translation
Merge pull request #234 from tkowark/develop-js

Develop js
Merge remote-tracking branch 'origin/develop' into develop-ak