Merge branch 'master' into ajax-tabs-refresh
track shown dialog & refresh when second edit dialog is dismissed
Merge pull request #31 from ryanttb/ajax-tabs-refresh

dialog-in-dialog refresh
Merge remote-tracking branch 'upstream/ajax-tabs-refresh'
customized emails
Merge pull request #34 from apatel/master

customized emails