Faris [#1512] Started.
1280 | Subhas | Added cucumber tests
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #332 from rdsubhas/master

1280 | Server-to-server Replication
#1225 - Ashok - Added translation field for option_string
TECH - Ashok - Added translation.js to gitignore
#1225 - Ashok/Kavitha - Fixed some of the feature related to form_section
#1225 - Ashok - Fixed form_section_helper spec
Merge branch 'master' of https://github.com/rapidftr/RapidFTR

Conflicts:
	public/javascripts/translations.js
Faris [#1512]
[1] Merged with recent code. All tests are passing.