managing users and affiliations
Merge pull request #41 from apatel/master

managing users and affiliations