ordenando un poco
Merge branch 'master' of https://github.com/ricardosiri68/patchcap

Conflicts:
	device.py