Updates device generated id fields and exposes them in JSON
Merge branch 'master' of github.com:techiev2/HaywireAPI

Conflicts:
	models.md