updated question subclasses and sql file so that we one table per question type
merging with master