Making things nicer
Merge branch 'develop' into feature/Settings_Update
Merge branch 'feature/Mail_Class' into develop
Merge branch 'feature/Settings_Update' into develop
Adding to todo
Merge branch 'feature/Settings_Update' into develop
adding the proper send grid post variables