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
Merge pull request #425 from rdsubhas/master

Comment out english translations copied in all other language files
Subhas | Fix Solr tmp directory
Merge pull request #426 from rdsubhas/master

Fix Solr tmpdir
Yekkanti - Generated translations for export with encryption story
Merge branch 'master' of github.com:rapidftr/RapidFTR
Akash/Faris - setting replication port based on protocol
Merge pull request #427 from akash/master

Akash/Faris - setting replication port based on protocol
Merge branch 'master' of git://github.com/rapidftr/RapidFTR