---
Merge remote-tracking branch 'origin/master'

Conflicts:
	alianza_aerea.php
	scripts/registrar_alianza.php