AI-586 Updated ODK template to order attributes/indicators as set by user in FormBuilder

The new form builder eliminates the distinction between
indicators and attributes and allows users to
put "fields" in any order.

I've added a work around to sort indicators and
attributes together without making big changes to the
legacy model at this point.