Merge origin/master

Conflicts:
	src/java/servlets/AdminPoolSelection.java
	src/java/sessionbeans/DataManager.java