Merge remote-tracking branch 'thomasb/master'

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/views/studien/_form.html.erb

@@ -1,7 +1,7 @@
 <div class="container-fluid">
   <%= tinymce_assets %>
   <%= semantic_form_for @studium do |f| %>
-  <div class="span9">
+
   <%= f.inputs do %>
 
   <div class="row-fluid">
@@ -18,11 +18,12 @@
   <div class="row-fluid">
     <%= f.input :desc, :as=>:tinymce_text %>
   </div>
+
   <% end %>
   <%= tinymce %>
   <%= f.actions do %>
   <%= f.action :submit, :as => :input %>
   <% end %>
-  </div>
+
   <% end %>
 </div>