Merge branch 'master'

Conflicts:
	core/src/main/java/org/jdal/beans/ProxyUtils.java
	core/src/main/java/org/jdal/beans/SerializableProxyFactoryBean.java
Merge branch 'master'

Conflicts:
	core/src/main/java/org/jdal/beans/SerializableProxyFactoryBean.java