stash
Merge branch 'master' into keith
borders
Fixes #2 Invite new user for Admin
fixed the checkbox on sign in page
fixed #29 add last names
Merge branch 'keith' into rob

Conflicts:
	db/schema.rb
Merge branch 'rob'