reset please
Merge branch 'master' of github.com:CharlesPs/newgmaps.carlos

Conflicts:
	application/controllers/capas.php