Commit lipman2
Merge branch 'master' of https://github.com/jmlipman/trabajojpa.git

Conflicts:
	TrabajoJPA/src/es/ubu/lsi/dao/management/AsignaturaDAO.java