Merge branch 'master' of github.com:dpmcgarry/LCFR-Mobile-Android