Allo non ProxyPlace to handle ContentSlot
Merge branch 'v1.2'

Conflicts:
	example/pom.xml
	generator/pom.xml