- 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