Merge pull request #423 from rdsubhas/master

1655 | Default "Translation Missing" message for dynamic translations
[#1615]Kavitha - Added Clear button to advanced search page
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
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