(Removed all @author JavaDoc directives, as they don't reflect reality anymore, and those with @author tags has agreed.)
Merge branch '2.3-gae' into 2.3

Conflicts:
	src/main/java/freemarker/core/FreeMarkerTree.java