merge issues
	modified:   src/basespace/builderScripts/form_callback.js
	modified:   src/basespace/builderScripts/formbuilder.json