Totally refactored form parser
Fixed fieldsets not assigning their fields
Merge branch 'forms'