Add email subscription
Update to the latest one
Merge branch 'develop'

* develop:
  Update to the latest one
  Add email subscription