Fixed a bug where admins cannot add members to group (I forgot to update a decorator)
Merge pull request #109 from mvd7793/master

Fixed a bug where admins cannot add members to a group
Merge pull request #110 from colegleason/master

Update of conference landing page to include register link.
Merge pull request #111 from colegleason/master

Add Type field to Companies: STARTUP or JOBFAIR
Merge pull request #112 from colegleason/master

Change text of startup fair invite email
url changes for conference
Removed the old conference landing page.  Added filter tabs to jobfair manager. You can no longer invite a company more than once (this was a bug).