bugfixes für bugs 4,9,33
Merge branch 'master' of https://github.com/fischerdom/tasking

Conflicts:
	app/controllers/tasks_controller.rb