change main cat and dev field name for consistency
remove obsolete new_dev_id param in edit device
Merge pull request #58 from michaelfung/master

change main cat and dev field name for consistency