moving a label
moving a label
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
Merge branch 'basics_07' into basics_08
Merge branch 'basics_08' into test_first_01

Conflicts:
	gatherer/app/models/task.rb
Merge branch 'test_first_01' into test_first_02
Merge branch 'test_first_02' into test_first_03

Conflicts:
	gatherer/test/integration/add_project_test.rb
oops
Merge branch 'test_first_01' into test_first_02
Merge branch 'test_first_02' into test_first_03
Merge branch 'test_first_03' into test_first_04

Conflicts:
	gatherer/app/models/task.rb
fixes
Merge branch 'test_first_04' into mocks_01

Conflicts:
	gatherer/app/models/task.rb