Fix crash in Appliance
Merge branch 'master' of github.com:Bloc/android-source