Merge branches 'development' and 'master'
Added third non-branching field.
Adjusted regex and changed how non-branching fields are parsed (now practically unlimited).  Field addresses are changing today.
Merge branches 'master' and 'development' into development
Changing field names to make them easier to understand.  Freezes on hover.