Merge branch 'jem' into jay
Merge branch 'jay' into jem
create CRUD for email notification settings