Updated with Android Activity for front-end
Merge branch 'master' of github.com:nma83/caifatcmd