Jaya| Fixed form section and add fields
Merge branch 'master' of github.com:rapidftr/RapidFTR
jaya|resolved conflicts for add custom field feature
Jaya|Fixed WIP cuckes|1700, 1701, 1697, 1705
jaya|fixed merge conflict
Merge pull request #435 from kjayamit/master

Fixed WIP cuckes|1700, 1701, 1697, 1705