Merge branch 'master' into rails3

Conflicts:
	.gitignore
	app/models/task.rb
	app/models/workgroup.rb
	app/views/shared/_group_form.html.haml
	config/locales/de.yml
	db/schema.rb

db/migrate/20120622094337_add_next_weekly_tasks_number_to_workgroups.rb

@@ -0,0 +1,9 @@
+class AddNextWeeklyTasksNumberToWorkgroups < ActiveRecord::Migration
+  def self.up
+    add_column :groups, :next_weekly_tasks_number, :integer, :default => 8
+  end
+
+  def self.down
+    remove_column :groups, :next_weekly_tasks_number
+  end
+end