[#1540] Faris : Added translation for dynamic text.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	app/controllers/children_controller.rb
[#1540] Faris : Added more dynamic text.
[#1540] Faris : Added translation to authentication.
[#1540] Faris : Added translation to the date_base controller.
FIX - Ashok - Fixed child record being duplicated during unverfied sync
[#1540] Faris : Fixed failing unit tests.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[#1540] Faris: Added static text.
[#1540] Faris : Translated static text.
[#1540] Faris : Fixed failing functional tests.
[Fix] Faris : Fixed tests in view_child_records.feature
[Fix] Fixed tests in duplicate_child_record.feature.
[#1540] Faris : Added translation for error messages in the user model.
[#1540] Faris : Added translation for the messages in the child model.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[#1540] Faris : Fixed a failing test.
[#1540] Faris : added translation to duplicate/new view.
Merge branch 'master' of github.com:rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	app/controllers/children_controller.rb