Merge origin/master

Conflicts:
	src/java/sessionbeans/EntityManager.java