Fixed bug
Merge branch 'develop'

* develop:
  Fixed bug
Fixed not sending email bug
Merge branch 'develop'

* develop:
  Fixed not sending email bug