Fixed quizDao and started on homepage friend activity
fixed merge conflicts