fixed disconnect check
Don't fire click when closing an alert
english fallback for 'reset_password' translations
Merge pull request #1157 from MakerStudios/alertclose_nofire_click

Don't fire click when closing an alert
Merge remote-tracking branch 'origin/master' into webserver.js-refactor