Commit para hacer pull
Merge remote-tracking branch 'origin/master'
Commit para hacer pull
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/sopinet/trazeo/app/helpers/Var.java
	app/src/main/java/com/sopinet/trazeo/app/osmlocpull/OsmLocPullReceiver.java
Mandar posición en background.
Merge remote-tracking branch 'origin/master'