cliente update
hibernate configs
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/java/com/asmoto/entity/Cliente.java