[#1865] Godwin/Faris - Refacored. Added integration test (awaiting bug fix).
Merge branch 'master' of github.com:farismosman/RapidFTR---Android