[#1619]Subhas/Kavitha - Users and roles included in replication
1619 | Subhas/Kavitha | Added unit and functional tests, and caching of HTTP responses
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	public/javascripts/translations.js
Subhas | Weekly Report was changed to every 5m, reverting and adding a unit test
ci | Subhas | Some tests have been failing for a long time, marking those as WIP until we fix those
Merge pull request #386 from rdsubhas/master

1619 | Subhas/Kavitha | Sync Users & Roles for server-to-server replication
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	public/javascripts/translations.js
[#1220] Akash/Faris : Refactored child_histories. Moved all the logic into children_helper. Refactoring in progress.
[#1220] Akash/Faris: Added child name and id to histories.
[#1220] Akash/Faris : Refactored by moving partial viewa form child_histories to shared/histories. user_histories is using the same partial views.