invite panel
Merge branch 'master' into invite-panel

Conflicts:
	demo/public/scripts/app.js
add send grid dependency
remove password