Merge branch 'kalender' of https://github.com/andreassteph/fetsite into calendar

Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
merge conflict behoben
Merge branch 'master' into calendar

Conflicts:
	app/views/lvas/show.html.erb
	db/schema.rb
Prüfungsinformation und Lernaufwand zu Lva hinzugefügt
Merge branch 'master' into calendar
Prüfungsinformationen und Typ zu lva hinzugefügt
Formtastic css, Lva-typ änderungen
Views überarbeitet
Merge branch 'master' into calendar
Merge branch 'master' of https://github.com/andreassteph/fetsite into calendar

Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb
Bugfix
Test mobile
Menü auf Collapsing navbar umgestellt
Menu Admin Link Fix
Bootstrap Link - Startseite, Wiki Link entfernt