edit alerts
Merge branch 'friendList' into phase1
Merge branch 'phase1' into gh-pages