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

app/controllers/beispiele_controller.rb

@@ -45,10 +45,6 @@ class BeispieleController < ApplicationController
     lvaid=params[:lva_id]
     params.delete(:lva_id)
     @beispiel = Beispiel.new(params[:beispiel])
-<<<<<<< HEAD
-    
-=======
->>>>>>> a5a02e065a319d162c5a280605c2c0d3c15643ca
     respond_to do |format|
       if @beispiel.save
         format.html { redirect_to @beispiel, notice: 'Beispiel was successfully created.' }