new question types
Merge remote-tracking branch 'origin/master'

Conflicts:
	yadumay/templates/test.html
new question types