Añadido web service
merge manual
merge manual
a
Merge branch 'master' of https://github.com/ParraSoft/webapp

Conflicts:
	geoloc/views.py