AssessmentQuestion
 resolved conflicts
Assessment Question create and update using kafka
conflicting file fixed in AssessmentQuestion

Conflicts:

api/src/main/java/org/ednovo/gooru/domain/service/kafka/KafkaConsumer.java

rest-v2-app/src/main/java/org/ednovo/gooru/controllers/v2/api/CollectionRestV2Controller.java
conflict-2 in AssessmentQuestion
Merge pull request #777 from prakashraja89/master

Gooru Assessment Integration