asd
Merge branch 'master' of https://github.com/lucaskz/bbdd2.git

Conflicts:
	src/hibernate/mappings.hbm.xml
asd
asd
asd
asd
Merge branch 'master' of https://github.com/lucaskz/bbdd2.git

Conflicts:
	bin/hibernate/mappings.hbm.xml
	src/hibernate/mappings.hbm.xml
ble34