Merge pull request #1 from IQSS/master

merge master into beta
Merge pull request #2 from IQSS/master

4/30 code drop to beta
Merge pull request #3 from IQSS/master

Update beta branch to 5/2
Merge pull request #4 from IQSS/master

Update beta branch to 5/6
Merge pull request #5 from IQSS/master

Update to 5/7, 3:01pm
Merge pull request #6 from IQSS/master

Update to 5/7, 2:45pm 4:02pm
Merge pull request #7 from IQSS/master

Update to 5/7,4:23pm, include new docs
Merge pull request #8 from IQSS/master

Update to 5/7, 6:16pm
Merge pull request #9 from IQSS/master

Update (again) to 5/7 6:33pm to fix 500 error on homepage
Merge pull request #10 from IQSS/master

Beta Candidate 1, May 8, 4:15pm
Merge pull request #11 from IQSS/master

2nd Beta Deployment, 5/20
Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master
Committing progress on cleaning up the UI for Roles + Permissions. Moved the entire Roles tab into a collapsable panel under Users. Added a static placeholder for Invite Users/Create Groups.
Merge origin/master