fixed slight email format error
Merge branch 'master' into demo
fixed email links wrong url