changes made to the answers page
issues fixed
conflicts resolved and merging issue-207 develop