I hope this fixes the android app error.
Merge branch 'master' of github.com:alexnedelcu/Dr-Smoothie