fixed the sidebar being to big\ndoes someone even check the website?
added rating for (natural) languages #35
change seed to valid programming languages #82
Merge branch 'develop-js-profile-validation' into develop
remove duplicates in seed file
removed border-radius from navbar
Merge branch 'develop' of github.com:tkowark/hpi-hiwi-portal into develop
Imprint done #116
faqs fixed #49
Merge branch 'develop-js-impressum' into develop
Imprint fixed #116
Merge remote-tracking branch 'origin/develop' into develop-ak
added initial chair_pages_spec and made chair controller + user model a little more robust against permission violation
more chair tests
added some users controller tests
Overworked footer #112
Merge branch 'develop' into develop-js

Conflicts:
	app/views/layouts/application.html.erb
	config/locales/views/layouts/de.yml
	config/locales/views/layouts/en.yml
#112 Added imprint to footer after mergin develop intpo develop-js, since the imprint did just exist in develop
tests and controller functionality for issue #119
added Buttons and tests to the view (#119)