Adds additional fields to Question model
Replaces dummy topic with actual question topic
Merge branch 'develop' of https://github.com/wayneyu/merapp into develop