Corrección de geolocalización
Merge remote-tracking branch 'choose_remote_name/master'
Pantalla Ajustes
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	IG/src/clicky/gcard/ig/adapters/GPSTrakcer.java
	IG/src/clicky/gcard/ig/adapters/NotificationsReceiver.java