consolidated final fix for custom fields
Merge branch 'develop' of https://github.com/nakautot/dirtyEd into develop