rename touch -> smartphone
add ipad, androit tablet support;
Merge branch 'tablet_support'