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 branch 'master' of git://github.com/rapidftr/RapidFTR
Akash - #1690 - added migration from R1 to R2 code
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #438 from rdsubhas/master

1707 | Subhas/Kavitha | Fix session token bug
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[#1702] Faris : Defaulting to English whenever translation is missing.
Akash - #1690 - added migration db to keep track of which migrations have run
[#1702] Faris : Fixed failing test in translation.feature by defaulting to English when translation is missing.
Merge pull request #439 from farismosman/master

[#1702] [Tech Task] Add script to handle missing translations
Merge pull request #435 from kjayamit/master

Fixed WIP cuckes|1700, 1701, 1697, 1705
Merge pull request #440 from akash/master

Akash - #1690 - added migration db to keep track of which migrations have been triggered
Subhas | Fix comment in feature