add device sort order
add 2 more device types
Merge pull request #59 from michaelfung/master

add device sort order