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/models/modul_spec.rb

@@ -1,5 +1,14 @@
 require 'spec_helper'
 
 describe Modul do
-  pending "add some examples to (or delete) #{__FILE__}"
+  it "should not be valid without name" do
+    m = FactoryGirl.build(:modul)
+    m.should_not be_valid
+    m.should have(1).errors_on(:name)
+  end
+  it "should be valid with name" do
+    m = FactoryGirl.build(:modul)
+    m.name = "Grundlagen"
+    m.should be_valid
+  end
 end