Gowri: fixed few merged conflicts
Merge branch 'master' of github.com:rapidftr/RapidFTR---Android