Task History implementiert
Merge branch 'master' of https://github.com/fischerdom/tasking

Conflicts:
	config/environments/development.rb