Merge pull request #204 from codand/master

Refactored UI code in MainActivity.java and QuestionActivity.java to XML