Updated device rules to match the iphone
Merge branch 'master' into gh-pages