1631 | Subhas/Kavitha | Fixed Rack bug in Windows/Ruby1.8.7
[translation] - Suganthi -Fixed translation missing for an error message
[#000]Kavitha|Senthil - Selecting translation for forms shows more forms
Merge git://github.com/farismosman/RapidFTR into translations
Yekkanti | removed unused puts
Merge branch 'master' of github.com:rapidftr/RapidFTR
[translation] - Suganthi - added translation for an error message
Merge branch 'translations'
1613 - Suganthi - Added translation for highlighted fields
1613 - Suganthi - Added translation for highlighted fields
[#000]Kavitha - Fixed : Field on edit,save,cancel action sequence breaks
Akash - hardcoded https for replication replaced with config based check
Akash - removing print statements and fixing build
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	app/controllers/children_controller.rb
Merge pull request #421 from akash/master

attempting to fix server-server sync across netbooks
1638 | Subhas | Fix more windows compatibility issues
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	lib/tasks/windows/Reset.bat
Merge pull request #422 from rdsubhas/master

Fix more windows compatibility issues
1655 | Subhas | Fix default message for missing translations in form section and field
ci | Subhas | Fix failing cuke