Add messages model to database
Merge branch 'contuct-us-db' into develop
Update email config
Merge branch 'email-settings' into develop
Update options in various forms
Merge branch 'form-options' into develop