Merge branch 'master' into development
fixed display image
added modal display after sent mail
Merge branch 'development'