[#1613] Faris : translation.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[#1613] Faris : translation.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	public/javascripts/translations.js
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[#translation] Faris
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[#translation] Faris : translating couchrest validation messages.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[#translation] Faris
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	public/javascripts/translations.js
[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