Realtime merge with master

modals, email notifications, etc