Nueva licencia
Merge branch 'master' of https://github.com/avilae/test into gs1format

Conflicts:
	LICENSE