fix
Merge branch 'master' of github.com:BboxLab/remote-template-android