FAQs CRUD fertig aber noch nicht getestet
FAQ Fehler gefixt
merge mit develop-js
faqs mit Rechten
FAQs mit Test
Internationalization
Merge branch 'develop' into develop-js-faq

Conflicts:
	Gemfile
	db/schema.rb
	db/seeds.rb
db/schema.rb
merge develop into develop-js-faq
added hpi logo to navbar
FAQs Localisation abgeschlossen
Merge branch 'develop-js-faq' into develop
FAQs mit Localisation
refactoring
Merge branch 'develop' of github.com:tkowark/hpi-hiwi-portal into develop
refactoring

getting rid of the deprecation warning
Merge branch 'develop' into develop-ak

Conflicts:
	config/routes.rb