"Adding new meta data fields to new resources and questions"
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/add/AddQuestionResourceView.java
Merge pull request #56 from suryanarayanakb/release-6.2

Adding new meta data fields to new resources and questions