use devicetype model to define device types
remove threadsafe
Merge branch 'master' of https://github.com/Cominch/dial-a-device

Conflicts:
	db/schema.rb
fix merge conflict
merge conflict resolve