Merge pull request #5 from bkng/master

integrated treatment page (Mariana)
moved handlebars locations
Merge branch 'master' of github.com:eastebry/AdaptiveODK

Conflicts:
	form-files/adaptiveIMCI_clinician/customPromptTypes.js
set font-size for proper display in Survey app