1631 | Subhas/Kavitha | Fixed Rack bug in Windows/Ruby1.8.7
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
Merge pull request #423 from rdsubhas/master

1655 | Default "Translation Missing" message for dynamic translations
[#1615]Kavitha - Added Clear button to advanced search page
ci | Subhas | Fix travis
Revert "1655 | Subhas | Fix default message for missing translations in form section and field"

This reverts commit d64193aede1d995a229e40507431561e285fbd98.
ci | Subhas | Fix travis build issues
Merge pull request #424 from rdsubhas/master

1655 | Subhas | Different fix for missing translations
[#1659]Yekkanti - Fixed the defect by not accpeting the blank passwords for encryption. Zip Archive any ways doesn't accept the blank passwords.
Merge branch 'master' of github.com:rapidftr/RapidFTR
translations | Subhas | Comment english translations which are copied everywhere
1664 | Subhas | Downgrade solr back to 1.3.3, New version of Solr doesn't work when searching for Separated
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	config/locales/es.yml
	config/locales/fr.yml
	config/locales/ru.yml
	config/locales/zh.yml
ci | Subhas | Enabling commented out cucumber builds on Travis
Fix failing test