[#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
Merge git://github.com/farismosman/RapidFTR into translations
[translation] - Suganthi - added translation for an error message
Merge branch 'translations'