Merge branch 'hotfix/0.2.5'
Fix formset fields ajax error correctly
Merge branch 'hotfix/0.2.6' into develop