Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts:
	app/views/layouts/menu.html.erb
	config/routes.rb

spec/factories/calendars.rb

@@ -0,0 +1,8 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :calendar do
+    name "MyString"
+    public false
+  end
+end

spec/factories/calentries.rb

@@ -0,0 +1,10 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :calentry do
+    start "2013-08-05 21:17:10"
+    ende "2013-08-05 21:17:10"
+    summary "MyString"
+    typ 1
+  end
+end