Fixed compiling error
Fixed merge conflict
Merge branch 'master' of https://github.com/ckumar1/smart-fridge-android