added facebook user pics
all tests passing, updated activities show
fixed merge conflict