Merge branch 'jay' into jem
create CRUD for email notification settings
add required function for status field
Merge remote-tracking branch 'origin/jay' into jem
Merge branch 'jem' into jay
Merge remote-tracking branch 'origin/jem' into jem
add index.php into email templates
Merge remote-tracking branch 'origin/jem' into jem
fix array key on update page
Merge remote-tracking branch 'origin/jem' into jem
Added CRUD and DB for email_forwards
Merge remote-tracking branch 'origin/jem' into jem
Merge branch 'jem' into jay
include index.php in emailforwards
Merge remote-tracking branch 'origin/jem' into jem
Merge branch 'jem' into jay
jem pogi