stash
 fixed conflicts
fixed role type, again. updated forms.
Merge pull request #40 from jcward10/participants

Participants