Merge branch 'master' of github.com:farismosman/RapidFTR---Android
Merge branch 'master' of github.com:farismosman/RapidFTR---Android