can add photo by gallery properly now for questions and answers
fixed merge conflicts