Merge branch 'master' into merge_master
create staff and design template
create custom template
app mail configuration
fix contact us bug
Merge remote-tracking branch 'origin/merge_master'
merge with viktor
create image from custom case study on home page
create slider for custom and design
Merge branch 'staff_case'