potali-5-1 add answer work in progress
Merge branch 'potali-5-1' of https://github.com/mdk199/rorproject into potali-5-1
potali-5-1 answer_cancel btn work in progress