- Fix problems
Merge branch 'master' of https://github.com/donaldp24/FloorSmart-Android