upgrade wicket & atmosphere
Merge branch '2.1.x'

Conflicts:
	pom.xml