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

app/views/lvas/show.html.erb

@@ -9,6 +9,8 @@
 
   <p><h4>Beschreibung</h4>
   <%= @lva.desc %>
+
+<%= link_to "Beispiel neu" , new_beispiel_path(:lva_id=>@lva.id) %>
 </p>
   <div class="row-fluid">
 <h4>Beispiele</h4>