More sample question development

Trying to handle a variety of question types.
Merge branch 'master' of github.com:dcavins/cc-aha-extras into dbwriting

Conflicts:
	includes/cc-aha-survey-template-tags.php