update from master
Merge pull request #412 from mimmi20/testing

Reordering resources
Merge branch 'master' of https://github.com/browscap/browscap into test-with-crossjoin