Novedades
Merge branch 'master' of https://github.com/Geodesia/geobasig

Conflicts:
	app.js
	app/img/logogeodesia.png
	groups.js
	index.html
	layers.js
	prox/prox.php
	sources.js