wip
bugfix
Merge branch 'master' of https://github.com/JustArchi/Android-Kitchen