Friend Accept/Reject dialog is dismissed after clicking one of the
options.
Merge branch 'master' of https://github.com/blchang/splist.git
Merge branch 'master' of https://github.com/blchang/splist.git
Stuff Changed...
Merge branch 'master' of https://github.com/blchang/splist.git

Conflicts:
	src/edu/berkeley/cs160/theccertservice/splist/ListActivity.java