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
Merge remote-tracking branch 'ecomba/master'
take my changes
Merge remote-tracking branch 'keir/master'

Conflicts:
	lib/collaborator.rb
	lib/group.rb
	views/style.erb
	views/style.erb.css
Merge branch 'master' of github.com:hoongman/collaborator into master2

Conflicts:
	features/login.feature
	features/posting_messages.feature
	features/step_definitions/login_page.rb
	lib/collaborator.rb
	lib/user.rb
	views/login_form.erb