#1611 - FIX - Ashok - Fixed Rest Client conflict issue when session is updated too frequently
Merge branch 'master' of github.com:rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[#1220] Akash/Faris : Fixing test in user_histories/index