alternate field setup moved after unsetting disabled fields, in saveAction()
Merge branch 'master' of https://github.com/perminov/core