Fixed pom: removed newline in surefire argline which prevented the bus tests from runnning
Fixed ERRAI-507: MarshallersGenerator fails for subtypes of generic entities
More pom fixes to remove newlines in surefire argline
Merge branch 'master' into 3.0

Conflicts:
	errai-cdi/weld-integration/pom.xml
	errai-ioc/pom.xml
Merge branch '3.0' of https://github.com/errai/errai into 3.0
cleanup or javadoc
upgrade from GWT 2.4.0 into 2.5.0 & fixed ui-binder incompatibilities

Conflicts:

	pom.xml
Merge branch 'master' into 3.0

Conflicts:
	errai-jpa/demos/errai-jpa-demo-grocery-list/pom.xml
	pom.xml
Fixed vanishing type arg in javadoc comment
- new AOP features in IOC container -- added test
- refactored the names of some classes for clarity
add ability to inject properties into proxies
add support for code weaving to async bean manager
fixed Errai UI -- de-magicifyed the InjectionPoint.getType()
Implemented ERRAI-504: Declarative data binding API can now be used in all IOC managed beans (not just in Errai UI)
Merge branch '3.0' of https://github.com/errai/errai into 3.0

Conflicts:
	errai-ui/src/main/java/org/jboss/errai/ui/rebind/DataFieldCodeDecorator.java
	errai-ui/src/main/java/org/jboss/errai/ui/rebind/TemplatedCodeDecorator.java
Removed BoundDataField class, no longer needed
data-binding: improved test and fixed issue with setter methods returning values
Merge branch 'master' into 3.0

Conflicts:
	errai-data-binding/src/main/java/org/jboss/errai/databinding/rebind/BindableProxyGenerator.java
data-binding: @Bound now also works on methods returning widgets
data-binding: fix for @Bound fields/methods in super classes