qwe
qwe
qwe
Merge remote-tracking branch 'origin/master'

Conflicts:
	jbossExample/ejb/src/main/java/dag/DagRemote.java
	jbossExample/web/src/main/java/dag/DagServlet.java
	jbossExample/web/src/main/java/dag/MyServlet.java
	src/main/java/serializationTransientFields/SerializationTest.java