Update factory_girl_rails
Begin to fix stuff
Fix invitations to collaborators