#263 Staff Edit Fix
#260 done student edit/profile enhancements except for the hover effect
Merge branch 'develop' into develop-js

Conflicts:
	app/views/staff/_form.html.erb
	config/locales/views/students/en.yml
fixed issue with nil-class after logging in for the first time
#260 hover effect and caret
Merge branch 'develop-js' of github.com:tkowark/hpi-hiwi-portal into develop-js
#283
- the navbar is blank, if a user is not signed in
- log out -> Log Out
#260 - language selection is now always available
#283 - navbar::admin
capitalized star description
Merge branch 'develop-js' of github.com:tkowark/hpi-hiwi-portal into develop-js
Merge branch 'develop' into develop-js

Conflicts:
	app/views/layouts/application.html.erb
	app/views/students/_form.html.erb
julias proposal for picture placement, made grey darker #290
Merge pull request #305 from tkowark/develop-js

Develop-js
tests
Merge branch 'develop-ak' of https://github.com/tkowark/hpi-hiwi-portal into develop-ak
Merge remote-tracking branch 'origin/develop' into develop-ak

Conflicts:
	app/views/students/show.html.erb
	config/locales/views/layouts/de.yml
	config/locales/views/layouts/en.yml