call to device.model now device.cordova
Merge branch 'master' into exp-branch1
Merge pull request #3 from Linnesq/tidy-up1

Tidy up1