Acerto JARs e BookingDAO
Merge branch 'master' of https://github.com/alvesl/TrabWeb

Conflicts:
	build/classes/hibernate.cfg.xml