Merge pull request #6 from cococoder/master

fixed the type naming conflict
now with add device_type_id to devices
now with add device_type_id to devices removed the database prefix
add the foreign key fo device type
Merge remote-tracking branch 'upstream/master'