Resolve #27: Convert to XLForms
fixed merge conflicts, updated simplified model for payment interval