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

spec/factories/moduls.rb

@@ -2,5 +2,9 @@
 
 FactoryGirl.define do
   factory :modul do
+    name ""
+    factory :other_modul do
+      name "Modul 1"
+      end
   end
 end