Merge pull request #332 from rdsubhas/master

1280 | Server-to-server Replication
1469 | Subhas | Added Windows Installer generation scripts using WIX

Conflicts:
	.gitignore
	Gemfile
#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
#1225 - Ashok/Kavitha - Converting the option_strings_text to array when sending json to mobile
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	.gitignore
1280 | Subhas | Mark CouchDB replication tests as pending, do we need to test couchdb itself?
1280 | Subhas | Mark more tests under the same CouchDB replication group as pending
#1423 - Yekkanti/Suganthi - Fixed defect with repetive messages in changelog
1234 | Subhas | Fix some defect