Unionfixes

inanes listas
Merge branch 'master' of https://github.com/MAMISHO/AppCostal-Beta

Conflicts:
	appCostal_beta/nbproject/private/private.xml