Merge branch 'master' into calendar

Conflicts:
	app/views/lvas/show.html.erb
	db/schema.rb

app/views/studien/semesteransicht.html.erb

@@ -13,9 +13,12 @@
       <div class="span12">
 	<div class="studien-semester">
 	  <div class="container-fluid">
-	    
-	    <h2><%= sem.name %> <%= link_to 'Lvas hinzufügen/entfernen', edit_semester_path(sem)%></h2>
-
+	    <div class="row-fluid">
+	      <div class="span8">
+	    <h2><%= sem.name %></h2>
+	    </div>
+	    <div class="span4"><div class="pull-right"><%= link_to 'Lvas hinzufügen/entfernen', edit_semester_path(sem), :class=>"btn"%></div>
+	    </div></div>
 	    <% sem.lvas.each_slice(4) do |row| %>
 	      <div class="row-fluid">
 		<% row.each do |l| %>