fromEntry alert not modal
Merge branch 'master' into production

* master:
  fromEntry alert not modal