Added some features introducted in Java 5.
Fixed conflict in OrderedPair on the Beach box.

Conflicts:
	src/java/generics/OrderedPair.java