reservas

trabajando en jsp
Merge branch 'maria'

Conflicts:
	nbproject/private/private.properties