Merge pull request #517 from jialinsun/master

fix some issue
Merge pull request #518 from jialinsun/master

add more info into web app alert mail
implement app web alert receiver mails mapping