tablet changes
Merge branch 'master' of github.com:tamasi/DishWasher