commiting before merge 16.17 10.05.13
commiting before merge 16.23 10.05.13
Merge remote-tracking branch 'ecomba/master'

Conflicts:
	lib/collaborator.rb
draft for Vincent
take my changes
Merge remote-tracking branch 'keir/master'

Conflicts:
	lib/collaborator.rb
	lib/group.rb
	views/style.erb
	views/style.erb.css