did stuff for friends list and getting images from server
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/edu/utexas/ee461l/slidesnap/NotificationsActivity.java
fixed typo