Traducciones
Merge branch 'master' of https://github.com/Australhawk/gasda

Conflicts:
	log/localeapp.yml