added static page
added detection
Merge branch 'dev' into tablet