Commit which is need because git wont let me merge the hibernate branch
Merge branch 'master' into AP2-Hibernate

Conflicts:
	bin/model/BeansFactory.class
	bin/model/IAbstractAddress.class
	bin/model/IAddressList.class
	bin/model/IEmailOnlyAddress.class
	bin/model/IPostalAddress.class
	bin/model/spring/AddressList.class
	bin/model/spring/EmailOnlyAddress.class
	bin/model/spring/PostalAddress.class

I fixed the merge conflicts.