Proper Search for tablet
Merge branch 'master' of https://github.com/c-clarky/ClubBiz