Merge origin/master

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/jax-ws.xml
	nbproject/jaxws-build.xml
	nbproject/project.properties
	nbproject/project.xml
	src/java/hiber/authent.java
	src/java/hibernate.cfg.xml