naming fix
rails 4.1 upgrade
Merge branch 'basics_01' into basics_02
Merge branch 'basics_02' into basics_03
Merge branch 'basics_03' into basics_04
Merge branch 'basics_04' into basics_05
Merge branch 'basics_05' into basics_06
Merge branch 'basics_06' into basics_07

Conflicts:
	gatherer/test/models/project_test.rb