añadido tipos de dispositivos
merge
Merge branch 'master' of https://github.com/ParraSoft/webapp

Conflicts:
	securekid/settings.py