naming fix per Avdi
Merge branch 'basics_03' into basics_04

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

Conflicts:
	gatherer/app/models/task.rb
more naming fix
Merge branch 'basics_06' into basics_07