some improvement
resolve conflits
broadcast email
Merge branch 'develop' into lxj