edit alerts
Merge branch 'friendList' into phase1