naming fix per Avdi
Merge branch 'basics_03' into basics_04

Conflicts:
	gatherer/app/models/task.rb
Merge branch 'basics_04' into basics_05